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
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
translators
1c2d29e1a3 Update: Translations from eints 
italian: 1 change by lorenzodv
 2018-06-05 19:45:38 +02:00
Jonathan G Rennison
d2d8a86814 Add setting: station rating waiting time tolerance depends on cargo class 2018-06-04 20:43:05 +01:00
PeterN
eaa32f5ad5 Change: Use name of cargo instead of Passengers/Mail in town statistics. (#6801) 
* Change: Use name of cargo instead of Passengers/Mail in town statistics.
* Cleanup: Remove strings from all language files.
 2018-06-04 13:14:11 +01:00
Jonathan G Rennison
f2072319cb Add autosave_on_network_disconnect setting to GUI 2018-05-30 08:36:48 +01:00
Jonathan G Rennison
cecbf257bc Merge branch 'save_ext' into template_train_replacement 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/vehicle_gui.cpp
 2018-05-25 19:12:10 +01:00
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
 2018-05-25 18:29:17 +01:00
translators
306b999cf4 Update: Translations from eints 
polish: 5 changes by xaxa
 2018-05-22 19:45:44 +02:00
translators
fb54dd04a1 Update: Translations from eints 
greek: 8 changes by Jubilee
 2018-05-12 19:45:40 +02:00
translators
d738e980d0 Update: Translations from eints 
dutch: 1 change by mrLeopold
 2018-05-11 19:45:40 +02:00
translators
7935ac16d1 Update: Translations from eints 
dutch: 1 change by mrLeopold
 2018-05-10 19:45:39 +02:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
 2018-05-03 23:54:51 +01:00
Jonathan G Rennison
98ade153d2 Fix colour definition for conditional order invalid slot string 2018-05-02 20:56:54 +01:00
translators
61515c9abd Update: Translations from eints 
belarusian: 10 changes by KorneySan
russian: 6 changes by KorneySan
spanish (mexican): 10 changes by Absay
 2018-05-02 19:45:41 +02:00
translators
3f40cd505d Update: Translations from eints 
croatian: 10 changes by VoyagerOne
italian: 4 changes by lorenzodv
french: 7 changes by glx
 2018-04-30 19:45:40 +02:00
translators
a806424ec1 Update: Translations from eints 
italian: 6 changes by lorenzodv
french: 6 changes by glx
russian: 9 changes by Lone_Wolf
 2018-04-29 19:45:58 +02:00
Niels Martin Hansen
683b46a5b5 Cleanup: Remove unused strings from language files 2018-04-29 19:26:05 +02:00
Niels Martin Hansen
19f5a6cbb0 Feature #6090: Change music set during gameplay 2018-04-29 19:26:05 +02:00
Niels Martin Hansen
bb809e35ce Change: Less intrusive "no music" message from Music window 2018-04-29 19:26:05 +02:00
PeterN
cfe6a8ea4f Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756) 2018-04-28 22:27:14 +01:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
keldorkatarn
78588d8ce5 First implementation of conditional order checking slot occupancy 
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)

Some code adjustments: serialisation/storage, formatting

See: #40
 2018-04-22 15:03:16 +01:00
translators
f4f9e18790 Update: Translations from eints 
belarusian: 3 changes by KorneySan
 2018-04-19 19:45:40 +02:00
Jonathan G Rennison
8e903b0a85 Merge branch 'departure-boards' into jgrpp 2018-04-17 16:35:29 +01:00
keldorkatarn
d2ca8914ac Departure Boards: Allow Ctrl-Click on vehicle type buttons to show type exclusively 
(cherry picked from commit a834d3cd452fe28e2c32fb953d41c0bd0ce20494)

See: #36
 2018-04-17 16:30:59 +01:00
translators
a72117111e Update: Translations from eints 
spanish (mexican): 6 changes by Absay
 2018-04-16 23:25:46 +02:00
translators
f84ad5f7c0 (svn r28004) -Update from Eints: 
belarusian: 42 changes by KorneySan
 2018-04-06 17:45:38 +00:00
translators
81f25d4736 (svn r28003) -Update from Eints: 
indonesian: 4 changes by fanioz
 2018-04-04 17:45:38 +00:00
Jonathan G Rennison
6ec78ff4b0 Add UI setting to disable mass action buttons for top-level vehicle lists 2018-03-29 20:39:25 +01:00
Jonathan G Rennison
53dd010f3b Add way to mass cancel vehicle go to depot/service 2018-03-29 19:37:16 +01:00
Jonathan G Rennison
2821599f6b Better handle out of track and depot through load cases 
Add advice messages for when loading is aborted due to out of track/depot
Handle non-aligned use of platform
Fix full-load behaviour
Fix speed limiting whilst advancing
 2018-03-29 19:16:44 +01:00