Commit Graph

7877 Commits

Author SHA1 Message Date
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
translators
94961732a3 Update: Translations from eints
basque: 4 changes by Thadah
2018-09-07 19:45:44 +02:00
translators
8137d14d33 Update: Translations from eints
russian: 1 change by Lone_Wolf
2018-09-06 19:45:43 +02:00
Jonathan G Rennison
a37e30dfd0 Merge branch 'master' into jgrpp 2018-08-29 02:26:16 +01:00
Jonathan G Rennison
3e50336079 Add trace restrict train status conditional 2018-08-21 19:22:35 +01:00
translators
703e7f8fc7 Update: Translations from eints
spanish (mexican): 1 change by Absay
2018-08-17 19:45:42 +02:00
keldorkatarn
6228a336d4 Show the most relevant information in the vehicle list window, based on what the list is sorted on.
(cherry picked from commit da2d0e14fecec35dbf805395200b12998c8cc52a)

Minor changes
2018-08-16 06:58:08 +01:00
Jonathan G Rennison
d8b9e2953e Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/command.cpp
#	src/saveload/extended_ver_sl.cpp
2018-08-16 05:49:07 +01:00
keldorkatarn
98da7019d6 Plans: Make it possible to give plans a name.
(cherry picked from commit d9b553f130a6eda36e2eea217785f829d3d8624e)
2018-08-16 05:30:56 +01:00
Jonathan G Rennison
5732e4f7ff Show reversing and timetable waiting in vehicle status bar 2018-08-14 11:24:40 +01:00
Jonathan G Rennison
5344ec1931 Add a "leave early" order timetable flag
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
2018-08-13 01:40:17 +01:00
Jonathan G Rennison
28c5453926 Merge branch 'master' into jgrpp 2018-08-12 03:08:27 +01:00
translators
50d930298d Update: Translations from eints
croatian: 1 change by VoyagerOne
2018-08-11 19:45:42 +02:00
translators
a53e4d8fe5 Update: Translations from eints
dutch: 137 changes by mrLeopold
2018-08-09 19:45:42 +02:00
translators
27c4f5517f Update: Translations from eints
dutch: 115 changes by mrLeopold
2018-08-08 19:45:45 +02:00
translators
004f54f4c8 Update: Translations from eints
hebrew: 23 changes by dnd_man
french: 45 changes by glx
2018-08-07 19:45:41 +02:00
Jonathan G Rennison
9038ac5c00 Merge branch 'master' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
2018-08-06 02:33:13 +01:00
translators
b34a1f372f Update: Translations from eints
italian: 1 change by lorenzodv
2018-08-04 19:45:41 +02:00
ScumbagDog
16cf577b61 Feature: Added New Russian Ruble as currency (#6678) 2018-08-04 08:58:50 +02:00
translators
76f788124b Update: Translations from eints
latvian: 8 changes by krixis02
2018-08-03 19:45:40 +02:00
Jonathan G Rennison
ef0a0b0f8e Implement rail station property 1B, bridge clearance information 2018-08-02 08:27:20 +01:00
translators
4bd281cef3 Update: Translations from eints
korean: 44 changes by telk5093
2018-07-30 19:45:41 +02:00
Jonathan G Rennison
b9d7f8e0a7 Disallow building bridges over airports 2018-07-30 01:55:58 +01:00
translators
64dac65e20 Update: Translations from eints
spanish (mexican): 1 change by Absay
2018-07-28 19:45:41 +02:00
Jonathan G Rennison
ae15c96c1a Merge branch 'master' into jgrpp
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
2018-07-26 20:54:13 +01:00
translators
b885f62676 Update: Translations from eints
croatian: 44 changes by VoyagerOne
polish: 6 changes by xaxa
2018-07-26 19:45:41 +02:00
translators
8090580f77 Update: Translations from eints
spanish (mexican): 25 changes by Absay
2018-07-25 19:45:41 +02:00