dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,805 Commits 1 Branch 0 Tags
a404db80f694392396d541d1cb61351a34489710
Commit Graph

8047 Commits

Author SHA1 Message Date
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
Jonathan G Rennison
035f5622b9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
 2018-07-24 18:30:42 +01:00
Jonathan G Rennison
4bdbf3863d Add setting to allow placing stations under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
56bde8ce18 Add setting to allow placing all NewGRF objects under bridges 2018-07-24 03:22:33 +01:00
translators
0bca1c53c9 Update: Translations from eints 
spanish (mexican): 19 changes by Absay
 2018-07-23 19:45:41 +02:00
translators
38443bab0b Update: Translations from eints 
catalan: 2 changes by juanjo
russian: 9 changes by Lone_Wolf
 2018-07-22 19:45:41 +02:00
translators
2f5cb9e4fc Update: Translations from eints 
catalan: 63 changes by juanjo
 2018-07-21 19:45:40 +02:00
translators
6a6ffddc5f Update: Translations from eints 
greek: 46 changes by kyrm
italian: 44 changes by lorenzodv
 2018-07-20 19:45:40 +02:00
Niels Martin Hansen
2a868b9f3b Feature: Framerate display window (#6822) 
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
 2018-07-19 21:17:07 +02:00
Jonathan G Rennison
3ed5d8f09f Add mechanism to lock wait times in timetable against autofill/automate changes 2018-07-19 00:32:24 +01:00
translators
93469a92f2 Update: Translations from eints 
korean: 3 changes by kevinhigh
 2018-07-18 19:45:40 +02:00
translators
3014213186 Update: Translations from eints 
malay: 11 changes by eidan_shafie
 2018-07-17 19:45:39 +02:00
translators
f70544074c Update: Translations from eints 
latin: 19 changes by Supercheese
english (us): 19 changes by Supercheese
 2018-07-11 19:45:41 +02:00
translators
85ef5acf29 Update: Translations from eints 
malay: 10 changes by eidan_shafie
spanish (mexican): 9 changes by Absay
 2018-07-10 19:45:40 +02:00
translators
ae13f88c12 Update: Translations from eints 
malay: 9 changes by eidan_shafie
 2018-07-09 19:45:37 +02:00
Jonathan G Rennison
6740a9a470 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
translators
8bbf06e0d4 Update: Translations from eints 
belarusian: 7 changes by KorneySan
russian: 7 changes by Lone_Wolf
 2018-07-08 19:45:37 +02:00
translators
5a11c6a036 Update: Translations from eints 
russian: 6 changes by Lone_Wolf
 2018-07-07 19:45:37 +02:00
translators
2ed0e30a8f Update: Translations from eints 
malay: 37 changes by eidan_shafie
 2018-07-05 19:45:41 +02:00
translators
f86dc6867e Update: Translations from eints 
serbian: 37 changes by Srbija
 2018-07-04 19:45:39 +02:00
translators
210afa3701 Update: Translations from eints 
serbian: 23 changes by Srbija
greek: 6 changes by Jubilee
russian: 1 change by Lone_Wolf
danish: 7 changes by filli1303
finnish: 21 changes by ln
 2018-07-03 19:45:42 +02:00
Jonathan G Rennison
3330e4cef8 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
 2018-07-02 21:04:06 +01:00
Jonathan G Rennison
0ae32838ea Merge branch 'save_ext' into cargo_type_order 
# Conflicts:
#	src/core/smallstack_type.hpp
 2018-07-02 18:52:22 +01:00
translators
4a35409e0f Update: Translations from eints 
italian: 1 change by lorenzodv
 2018-07-02 19:45:39 +02:00
translators
8f278b3405 Update: Translations from eints 
croatian: 4 changes by VoyagerOne
 2018-07-01 19:45:40 +02:00
translators
6c02c19931 Update: Translations from eints 
italian: 3 changes by lorenzodv
 2018-06-27 19:45:41 +02:00
Jonathan G Rennison
4d1bd8e4b4 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp
 2018-06-25 18:57:48 +01:00
translators
7eca4a9b47 Update: Translations from eints 
french: 5 changes by glx
 2018-06-25 19:45:40 +02:00
Jonathan G Rennison
dc8fff2c4d Add: Hover tool-tips to cargo dest flow legend window. 
This is to improve the usability of the window.
The two-letter abbreviations are not always clear, in particular
when using a large number of cargoes.
The company colours can be ambiguous when there are a large
number of companies.
 2018-06-24 20:18:10 +02:00
translators
889175f7ad Update: Translations from eints 
croatian: 1 change by VoyagerOne
italian: 1 change by lorenzodv
french: 1 change by glx
 2018-06-24 19:45:46 +02:00