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

7877 Commits

Author SHA1 Message Date
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
Alberth
7fed8fe004 Fix #6553: Make viewport button text unambiguous. 2018-06-24 15:03:06 +02:00
Alberth289346
11ba094582 Feature #4186: Append '(City)' behind cities in the town directory (sbr) 2018-06-23 14:02:50 +02:00
translators
21ac11548a Update: Translations from eints 
korean: 1 change by telk5093
 2018-06-22 19:45:39 +02:00
Jonathan G Rennison
ef0a458ab6 Add go to depot and sell vehicle orders 
Controlled by a setting (default off)
 2018-06-21 23:28:19 +01:00
kiwitreekor
f00930fa52 Merge pull request #59 from kiwitreekor 
Squashed commit of the following:

commit 0497399a03f7279d47d67879516613105dd64f92
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 22:10:27 2018 +0900

    Update korean.txt

commit c4d60bc9e9db9543df68799d72cb903323a4ef37
Merge: 27729f1 0ac92b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 00:10:11 2018 +0900

    Merge branch 'jgrpp' into jgrpp

commit 27729f10fc82bea86bfe790998c95a780bfe3d9e
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Thu Jun 21 00:02:20 2018 +0900

    Update Korean Translation

commit 1e67b51ed818f241acd28cdd1f5104d7839cb1f0
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:33:04 2018 +0900

    Add files via upload

commit 9ee0445edd2f44ab8c885114ad1f49c8d20506b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:30:43 2018 +0900

    upload mistake

commit 21bc4d9db104b151e90648855c2ca6b45df80097
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:27:51 2018 +0900

    Fix Mistypo

commit 716b451d8b32bcfa8a051637fe41ed809a8989b8
Author: kiwitreekor <kiwitreekor@gmail.com>
Date:   Sat Jan 13 21:25:15 2018 +0900

    Update Korean Translation
 2018-06-21 20:56:56 +01:00
Jonathan G Rennison
2586096ef6 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-06-17 23:24:22 +01:00
Jonathan G Rennison
e9f5d80440 Trace restrict slots: Add support for slot operations at PBS end signal 2018-06-17 21:13:53 +01:00
Jonathan G Rennison
1b4db7d86c Trace restrict: Add wait at entrance PBS for reservation ending here 2018-06-17 18:55:33 +01:00
Jonathan G Rennison
e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h
 2018-06-17 09:35:18 +01:00
Jonathan G Rennison
814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 2018-06-17 04:27:03 +01:00
translators
4099506093 Update: Translations from eints 
chinese (simplified): 5 changes by xiangyigao
 2018-06-16 19:45:39 +02:00
translators
f5f2125238 Update: Translations from eints 
russian: 11 changes by Lone_Wolf
 2018-06-15 19:45:39 +02:00
translators
7ae1e3e1e2 Update: Translations from eints 
korean: 15 changes by telk5093
greek: 4 changes by Jubilee
 2018-06-12 19:45:40 +02:00
translators
470ed2643e Update: Translations from eints 
croatian: 4 changes by VoyagerOne
french: 3 changes by glx
polish: 2 changes by McZapkie
 2018-06-08 19:45:41 +02:00
Jonathan G Rennison
f2987854c7 Merge branch 'master' into jgrpp 2018-06-08 02:20:07 +01:00
translators
20b0f0f90b Update: Translations from eints 
italian: 3 changes by lorenzodv
 2018-06-07 19:45:38 +02:00
Jonathan G Rennison
8e9d68048a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/string.cpp
 2018-06-07 06:49:18 +01:00
translators
2b662b448c Update: Translations from eints 
french: 1 change by glx
 2018-06-06 19:45:38 +02:00
Peter Nelson
408cee123d Fix: One-way roads could be over-built by road stops (regardless of road owner.) 2018-06-06 07:20:46 +01:00
Niels Martin Hansen
921101ed06 Feature: Baseset music for TTD DOS and TTO data 2018-06-05 22:58:35 +02:00