Commit Graph

9103 Commits

Author SHA1 Message Date
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
2019-11-12 18:43:10 +00:00
translators
4eab70f84e Update: Translations from eints
polish: 115 changes by azabost
vietnamese: 5 changes by nglekhoi
2019-11-10 19:45:40 +01:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
ca3c72438e Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp
2019-11-06 17:49:00 +00:00
translators
460f73cd2d Update: Translations from eints
tamil: 22 changes by aswn
2019-11-02 19:45:41 +01:00
translators
58122983fb Update: Translations from eints
korean: 6 changes by telk5093
2019-10-30 19:45:40 +01:00
translators
1a13e03c49 Update: Translations from eints
korean: 2 changes by telk5093
2019-10-29 19:45:38 +01:00
translators
90682f8623 Update: Translations from eints
spanish (mexican): 2 changes by Absay
2019-10-27 19:45:42 +01:00
translators
81272000f8 Update: Translations from eints
finnish: 6 changes by hpiirai
tamil: 62 changes by aswn
dutch: 2 changes by JanWillem
2019-10-21 19:45:39 +02:00
translators
0d599e155f Update: Translations from eints
russian: 2 changes by Lone_Wolf
2019-10-20 19:45:39 +02:00
Jack Baron
7c9dedb94f Feature: Configure minimum share trading years 2019-10-19 20:31:44 +01:00
translators
c95c349dd5 Update: Translations from eints
french: 1 change by glx
2019-10-17 19:45:40 +02:00
TELK
6eef6ac8d5 ko-KR: Update translation for 0.32.0 2019-10-12 22:10:53 +09:00
Jonathan G Rennison
03fbe87752 Merge branch 'master' into jgrpp 2019-10-12 00:56:56 +01:00
translators
e2e112baaa Update: Translations from eints
chinese (traditional): 1 change by firetimer
chinese (simplified): 66 changes by firetimer
2019-10-08 19:45:39 +02:00
Jonathan G Rennison
7332c0b673 Tracerestrict: Add load percentage conditional 2019-10-08 18:42:18 +01:00
Jonathan G Rennison
b77484c930 Merge branch 'master' into jgrpp 2019-10-06 01:45:38 +01:00
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
2019-10-05 21:45:54 +01:00
translators
875419e4ee Update: Translations from eints
estonian: 12 changes by henrikp
2019-10-04 19:45:37 +02:00
translators
865eea8173 Update: Translations from eints
indonesian: 2 changes by fanioz
french: 3 changes by arikover
hungarian: 4 changes by Brumi
2019-10-02 19:45:39 +02:00
translators
2e30601b9c Update: Translations from eints
czech: 91 changes by djst, 6 changes by belaseoci
spanish (mexican): 2 changes by Absay
2019-09-30 19:45:38 +02:00
translators
ceb29cef85 Update: Translations from eints
chinese (simplified): 12 changes by ww9980
2019-09-20 19:45:40 +02:00
translators
23168ff3d8 Update: Translations from eints
chinese (simplified): 6 changes by ww9980
2019-09-19 19:45:39 +02:00
translators
b18a58d5e1 Update: Translations from eints
spanish (mexican): 9 changes by Absay
2019-09-18 19:45:40 +02:00
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
2019-09-18 01:18:28 +01:00
Jonathan G Rennison
a30638bc4a Merge branch 'jgrpp' into jgrpp-nrt 2019-09-16 22:28:35 +01:00
translators
f81cb0a90d Update: Translations from eints
korean: 1 change by telk5093
2019-09-11 19:45:38 +02:00
translators
b30994168d Update: Translations from eints
korean: 34 changes by telk5093
2019-09-10 19:45:38 +02:00
translators
058dadf315 Update: Translations from eints
french: 4 changes by glx
2019-09-06 19:45:39 +02:00
Jonathan G Rennison
b3431512ee Add modifier key window for toggling shift/ctrl key states using mouse 2019-09-05 23:21:41 +01:00
translators
c4850475c3 Update: Translations from eints
slovenian: 4 changes by matej1245
2019-09-04 19:45:39 +02:00
translators
14bca19163 Update: Translations from eints
italian: 4 changes by lorenzodv
2019-08-31 19:45:40 +02:00
translators
c7c1d1cb0c Update: Translations from eints
spanish: 1 change by lpenap
2019-08-24 19:45:40 +02:00
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
2019-08-24 11:00:41 +01:00
translators
dabccf70b4 Update: Translations from eints
dutch: 2 changes by JanWillem
russian: 7 changes by Lone_Wolf
2019-08-18 19:45:40 +02:00
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.
2019-08-17 22:02:22 +01:00
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
2019-08-17 21:45:20 +01:00
translators
27d676e17a Update: Translations from eints
danish: 2 changes by njn
2019-08-08 19:45:45 +02:00
nikolas
7a70900227 Fix: Typo in running costs help text 2019-08-07 13:27:07 +02:00
translators
9fd91f9b69 Update: Translations from eints
english (us): 2 changes by njn
2019-08-06 19:45:43 +02:00
translators
88950d8f23 Update: Translations from eints
swedish: 49 changes by daishan
spanish: 80 changes by lpenap
2019-07-15 19:45:44 +02:00
translators
24cec63a3d Update: Translations from eints
welsh: 13 changes by kazzie
spanish: 35 changes by lpenap
2019-07-14 19:45:46 +02:00
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
2019-07-13 20:34:52 +01:00
translators
a52bbb72a8 Update: Translations from eints
welsh: 4 changes by kazzie
2019-07-12 19:45:45 +02:00
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
2019-07-11 20:03:23 +01:00
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
2019-07-11 19:45:56 +01:00
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
2019-07-08 16:19:07 +01:00
pnda
a35b43ce93 Fix #6666: Mismatched parentheses in RTL languages 2019-07-07 18:30:51 +02:00
Jonathan G Rennison
91c5dee66c Re-add removed group collapse/expand all buttons 2019-07-03 18:16:25 +01:00
translators
2e23c5ec15 Update: Translations from eints
korean: 1 change by telk5093
2019-07-02 19:45:45 +02:00