Jonathan G Rennison
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
translators
|
865eea8173
|
Update: Translations from eints
indonesian: 2 changes by fanioz
french: 3 changes by arikover
hungarian: 4 changes by Brumi
|
5 years ago |
|
translators
|
2e30601b9c
|
Update: Translations from eints
czech: 91 changes by djst, 6 changes by belaseoci
spanish (mexican): 2 changes by Absay
|
5 years ago |
|
translators
|
ceb29cef85
|
Update: Translations from eints
chinese (simplified): 12 changes by ww9980
|
5 years ago |
|
translators
|
23168ff3d8
|
Update: Translations from eints
chinese (simplified): 6 changes by ww9980
|
5 years ago |
|
translators
|
b18a58d5e1
|
Update: Translations from eints
spanish (mexican): 9 changes by Absay
|
5 years ago |
|
Jonathan G Rennison
|
1f535915d1
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# config.lib
# src/core/bitmath_func.hpp
# src/lang/korean.txt
# src/main_gui.cpp
# src/order_gui.cpp
# src/script/api/script_object.cpp
# src/station_cmd.cpp
# src/video/cocoa/wnd_quartz.mm
|
5 years ago |
|
Jonathan G Rennison
|
a30638bc4a
|
Merge branch 'jgrpp' into jgrpp-nrt
|
5 years ago |
|
translators
|
f81cb0a90d
|
Update: Translations from eints
korean: 1 change by telk5093
|
5 years ago |
|
translators
|
b30994168d
|
Update: Translations from eints
korean: 34 changes by telk5093
|
5 years ago |
|
translators
|
058dadf315
|
Update: Translations from eints
french: 4 changes by glx
|
5 years ago |
|
Jonathan G Rennison
|
b3431512ee
|
Add modifier key window for toggling shift/ctrl key states using mouse
|
5 years ago |
|
translators
|
c4850475c3
|
Update: Translations from eints
slovenian: 4 changes by matej1245
|
5 years ago |
|
translators
|
14bca19163
|
Update: Translations from eints
italian: 4 changes by lorenzodv
|
5 years ago |
|
translators
|
c7c1d1cb0c
|
Update: Translations from eints
spanish: 1 change by lpenap
|
5 years ago |
|
Jonathan G Rennison
|
6562937899
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# src/console_cmds.cpp
# src/script/api/script_order.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/town_gui.cpp
|
5 years ago |
|
translators
|
dabccf70b4
|
Update: Translations from eints
dutch: 2 changes by JanWillem
russian: 7 changes by Lone_Wolf
|
5 years ago |
Niels Martin Hansen
|
5feb06e3f3
|
Add: Scale oil refinery edge distance up by map size
Also scales oil rig distance up, since they use the same algorithm.
|
5 years ago |
Gabda
|
b870596f15
|
Add #6887: Option to show zone inside local authority boundary of towns
Can be found at town information > local authority window
Layout for button is same as Graph Keys
Turn on/off for every town individually
|
5 years ago |
|
translators
|
27d676e17a
|
Update: Translations from eints
danish: 2 changes by njn
|
5 years ago |
nikolas
|
7a70900227
|
Fix: Typo in running costs help text
|
5 years ago |
|
translators
|
9fd91f9b69
|
Update: Translations from eints
english (us): 2 changes by njn
|
5 years ago |
|
translators
|
88950d8f23
|
Update: Translations from eints
swedish: 49 changes by daishan
spanish: 80 changes by lpenap
|
5 years ago |
|
translators
|
24cec63a3d
|
Update: Translations from eints
welsh: 13 changes by kazzie
spanish: 35 changes by lpenap
|
5 years ago |
|
Jonathan G Rennison
|
d3e0c3787f
|
Merge branch 'master' into jgrpp-nrt
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
|
5 years ago |
|
translators
|
a52bbb72a8
|
Update: Translations from eints
welsh: 4 changes by kazzie
|
5 years ago |
|
Jonathan G Rennison
|
dbc5f1baed
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
|
5 years ago |
|
Jonathan G Rennison
|
ba8ed880c1
|
Merge branch 'master' into jgrpp-nrt
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
|
5 years ago |
|
Jonathan G Rennison
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
5 years ago |
pnda
|
a35b43ce93
|
Fix #6666: Mismatched parentheses in RTL languages
|
5 years ago |
|
Jonathan G Rennison
|
91c5dee66c
|
Re-add removed group collapse/expand all buttons
|
5 years ago |
|
translators
|
2e23c5ec15
|
Update: Translations from eints
korean: 1 change by telk5093
|
5 years ago |
|
translators
|
f1c3915341
|
Update: Translations from eints
norwegian (bokmal): 25 changes by Leifbk
|
5 years ago |
|
translators
|
ac610c50a9
|
Update: Translations from eints
italian: 38 changes by lorenzodv
|
5 years ago |
|
translators
|
b878891289
|
Update: Translations from eints
english (us): 38 changes by njn
|
5 years ago |
|
translators
|
7ad9971cf0
|
Update: Translations from eints
croatian: 3 changes by VoyagerOne
|
5 years ago |
|
translators
|
7f7aba9389
|
Update: Translations from eints
hungarian: 3 changes by Brumi
|
5 years ago |
|
translators
|
00000ef8fa
|
Update: Translations from eints
korean: 3 changes by telk5093
|
5 years ago |
|
translators
|
0518ed01b6
|
Update: Translations from eints
czech: 48 changes by djst
russian: 3 changes by Lone_Wolf
|
5 years ago |
|
translators
|
45511080b1
|
Update: Translations from eints
finnish: 3 changes by hpiirai
dutch: 3 changes by JanWillem
bulgarian: 54 changes by zhelyo
french: 3 changes by glx
|
5 years ago |
iigmir
|
5b09323a58
|
Add: Currency: NTD, CNY, HKD
|
5 years ago |
|
Jonathan G Rennison
|
98cfcebfcd
|
Merge pull request #91 into jgrpp
|
5 years ago |
TELK
|
9efa181b58
|
ko-KR: for 0.31.1
|
5 years ago |
|
translators
|
ef74af6766
|
Update: Translations from eints
finnish: 32 changes by hpiirai
spanish (mexican): 16 changes by Absay
|
5 years ago |
|
translators
|
aee3e4e496
|
Update: Translations from eints
hungarian: 7 changes by Brumi
|
5 years ago |
|
translators
|
c1d26d8884
|
Update: Translations from eints
croatian: 7 changes by VoyagerOne
|
5 years ago |
|
Jonathan G Rennison
|
8042150a35
|
Add error messages for vehicle build failure due to wrong depot owner and rail type
|
5 years ago |
|
translators
|
24493548da
|
Update: Translations from eints
french: 7 changes by glx
korean: 8 changes by telk5093
|
5 years ago |
|
translators
|
f8fb9fda6b
|
Update: Translations from eints
russian: 7 changes by Lone_Wolf
|
5 years ago |
|
Jonathan G Rennison
|
af64b5dc18
|
Add news/advice setting to warn if no depot order in vehicle schedule
|
5 years ago |