Commit Graph

9103 Commits

Author SHA1 Message Date
Jonathan G Rennison
2003a86932 Merge remote-tracking branch 'origin/master' into jgrpp
# Conflicts:
#	src/string.cpp
2018-12-10 18:40:05 +00:00
translators
68b5b11b7c Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
2018-12-09 19:45:44 +01:00
Jonathan G Rennison
cd41683b9b Add tracerestrict feature reverse behind signal 2018-12-09 01:13:27 +00:00
translators
c63f0b3005 Update: Translations from eints
chinese (simplified): 28 changes by ww9980
spanish: 12 changes by SilverSurferZzZ
2018-12-08 19:45:43 +01:00
translators
cd44e33f4e Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
portuguese: 2 changes by Samu
2018-12-07 19:45:44 +01:00
translators
587c2149b6 Update: Translations from eints
croatian: 23 changes by VoyagerOne
spanish: 8 changes by SilverSurferZzZ
2018-12-03 19:45:44 +01:00
translators
88894166e8 Update: Translations from eints
italian: 23 changes by lorenzodv
spanish: 2 changes by SilverSurferZzZ
2018-11-29 19:45:43 +01:00
Jonathan G Rennison
5b0cca4b57 Merge branch 'newgrf-property-mapping' into jgrpp
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
2018-11-28 02:41:52 +00:00
translators
eab3aa16aa Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
2018-11-27 19:45:42 +01:00
Jonathan G Rennison
7f87e3d61c Add an action 5 type ID remapping mechanism 2018-11-27 04:06:21 +00:00
Jonathan G Rennison
b1190b32b0 Merge branch 'master' into jgrpp 2018-11-26 18:49:15 +00:00
Jonathan G Rennison
e3207a77fb Add setting to control if and how land purchasing is permitted 2018-11-26 18:25:17 +00:00
damfr
5d8b9de482 Add: Message popup when trying to overwrite a different savegame 2018-11-26 10:42:23 +01:00
damfr
1b3ce25c07 Add: Warning in save description when showing a save whith a different id 2018-11-26 10:32:35 +01:00
damfr
868c6f924a Add: Filter box to the save and load windows (#6974)
Save and heightmap names can be filtered.
2018-11-25 20:54:25 +01:00
translators
af4a21bd82 Update: Translations from eints
korean: 4 changes by telk5093
spanish: 3 changes by SilverSurferZzZ
russian: 8 changes by Lone_Wolf
2018-11-25 19:45:41 +01:00
Niels Martin Hansen
9e30fbab34 Fix #6864: Normalise colour use in Frame rate window 2018-11-25 17:27:53 +01:00
translators
f35a59fd38 Update: Translations from eints
spanish (mexican): 2 changes by Absay
2018-11-24 19:45:43 +01:00
Jonathan G Rennison
46b1ea81e4 Add company rate limit for land area purchasing 2018-11-23 18:47:36 +00:00
Jonathan G Rennison
f3c52f1b6c Merge branch 'master' into jgrpp 2018-11-22 19:04:59 +00:00
translators
16a36dffa0 Update: Translations from eints
spanish: 2 changes by SilverSurferZzZ
2018-11-21 19:45:42 +01:00
Jonathan G Rennison
c1df63a2eb Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
2018-11-19 20:51:16 +00:00
Jonathan G Rennison
8b37e5aac2 Implement custom bridge pillar flag support
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars

Set values for default bridges and stations
2018-11-17 19:49:05 +00:00
translators
278a705bbb Update: Translations from eints
indonesian: 41 changes by UseYourIllusion
2018-11-14 19:45:40 +01:00
translators
71cda6ca1d Update: Translations from eints
spanish: 10 changes by SilverSurferZzZ
2018-11-13 19:45:42 +01:00
translators
6950ea0ba7 Update: Translations from eints
indonesian: 18 changes by UseYourIllusion
2018-11-12 19:45:40 +01:00
Jonathan G Rennison
06c458cb19 Merge branch 'newgrf-property-mapping' into jgrpp
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
2018-11-11 11:27:41 +00:00
Jonathan G Rennison
9a6a66a054 Add general NewGRF Action 0 property mapping scheme to Action 14 2018-11-11 11:26:05 +00:00
translators
16cc482d57 Update: Translations from eints
croatian: 2 changes by VoyagerOne
2018-11-08 19:45:43 +01:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
2018-11-05 12:53:36 +00:00
Jonathan G Rennison
83a063f51c Add train is in slot conditional order 2018-11-05 04:21:08 +00:00
translators
ccd9d77b94 Update: Translations from eints
italian: 2 changes by lorenzodv
2018-11-04 19:45:42 +01:00
Niels Martin Hansen
e66cec8f86 Add: NewGRF support for 16-in-16-out industries 2018-11-03 21:43:54 +01:00
translators
32b9ee7063 Update: Translations from eints
latvian: 3 changes by krixis02
2018-11-03 19:45:42 +01:00
Oskari Leppäaho
b3b89257f7 Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION" 2018-10-31 19:24:21 +01:00
Jonathan G Rennison
3a640af71d Merge branch 'master' into jgrpp
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
2018-10-29 18:33:15 +00:00
translators
47ff673664 Update: Translations from eints
finnish: 25 changes by ln
2018-10-26 19:45:42 +02:00
translators
bddf25c36a Update: Translations from eints
portuguese (brazilian): 66 changes by Tucalipe
2018-10-23 19:45:44 +02:00
Jonathan G Rennison
ee00a28717 Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
2018-10-18 23:57:20 +01:00
Jonathan G Rennison
c4f5c8e789 TBTR: Add option to replace only old vehicles 2018-10-18 23:54:40 +01:00
translators
fbfa4eb592 Update: Translations from eints
polish: 3 changes by xaxa
2018-10-08 19:45:44 +02:00
Jonathan G Rennison
92a5e59165 Zoning: Add modes to show 2x2 and 3x3 town road grids 2018-10-06 13:01:01 +01:00
translators
9cf999bca7 Update: Translations from eints
korean: 2 changes by telk5093
2018-10-03 19:45:41 +02:00
translators
8a70101e7f Update: Translations from eints
vietnamese: 63 changes by myquartz
2018-10-02 19:45:40 +02:00
translators
25a060b4ae Update: Translations from eints
vietnamese: 2 changes by myquartz
2018-10-01 19:45:43 +02:00
translators
060248a422 Update: Translations from eints
spanish (mexican): 2 changes by Absay
2018-09-24 19:45:43 +02:00
Jonathan G Rennison
6bcc705c7c Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/saveload.cpp
2018-09-20 08:32:56 +01:00
translators
59a1614ba0 Update: Translations from eints
czech: 27 changes by djst
croatian: 1 change by VoyagerOne
italian: 1 change by lorenzodv
2018-09-19 19:45:44 +02:00
Max Maton
eed0da60a2 Fix #6622: Fixes empty company name in news when gamescript constructs a town 2018-09-18 18:35:26 +02:00
Jonathan G Rennison
ce4e2ca3c3 Add setting to enable flipping direction of all train types in depot 2018-09-11 06:08:02 +01:00