dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,911 Commits 1 Branch 0 Tags
4528004bb8a6d851955b9ad3e2243b369ec2ed26
Commit Graph

17436 Commits

Author SHA1 Message Date
Jonathan G Rennison
b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2017-04-05 19:00:24 +01:00
Jonathan G Rennison
4d21d6f81c Merge branch 'chunnel' into jgrpp 2017-04-04 23:30:04 +01:00
Jonathan G Rennison
80d56307c7 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/group_gui.cpp
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/vehicle_sl.cpp
#	src/window.cpp
 2017-04-04 19:22:56 +01:00
Jonathan G Rennison
f50a9fef4f Add TRRS tracerestrict slot chunk to SLXI header. 2017-04-04 18:47:21 +01:00
translators
9ed6c2ebe1 (svn r27847) -Update from Eints: 
german: 19 changes by planetmaker
 2017-04-04 17:45:36 +00:00
peter1138
2e52de3406 (svn r27846) -Fix [FS#5926]: Infinite loop in pathfinder when checking safe waiting position from a waypoint. 2017-04-04 00:00:43 +00:00
Jonathan G Rennison
40eff50c98 Clear waiting due to tracerestrict flag when no longer required. 2017-04-04 00:39:46 +01:00
peter1138
df5923d798 (svn r27845) -Change: (Yapf) Use FindDepotData struct to simplify depot finding code and remove need to return fake path distance. (juanjo) 2017-04-03 22:02:28 +00:00
peter1138
95acc016ba (svn r27844) -Change: (Yapf) Treat max cost exceeded separately from path too long condition, as destination should not be considered in the former case. 2017-04-03 21:53:51 +00:00
peter1138
4b63778116 (svn r27843) -Change: (Yapf) Consider depot as destination before reversing path and applying penalty. 2017-04-03 21:37:01 +00:00
translators
e37d54fb08 (svn r27842) -Update from Eints: 
spanish: 9 changes by SilverSurferZzZ
 2017-04-03 17:45:36 +00:00
peter1138
7e915f8bc7 (svn r27841) -Fix: Don't consider locks or ship depots as clear water when placing industries. 2017-04-02 17:36:53 +00:00
Jonathan G Rennison
8317eac918 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
 2017-04-01 01:14:28 +01:00
Jonathan G Rennison
86d1a00ba6 Merge branch 'master' into save_ext 2017-04-01 01:10:21 +01:00
Jonathan G Rennison
83091f55da Merge branch 'vehicle_group_info' into jgrpp 2017-04-01 01:02:22 +01:00
Jonathan G Rennison
e4aacee627 Merge branch 'master' into vehicle_group_info 
# Conflicts:
#	src/group_gui.cpp
#	src/saveload/vehicle_sl.cpp
 2017-04-01 01:02:05 +01:00
peter1138
f17d38598a (svn r27838) -Fix: Small news window's fake caption (r19943) was not sized to fit its text. 2017-03-31 23:09:50 +00:00
Jonathan G Rennison
85c7c4b307 Merge branch 'signal_tunnels_bridges' into jgrpp 2017-03-31 22:43:12 +01:00
Jonathan G Rennison
ab595bf67c Fix bridge/tunnel exit PBS signals never being set to green. 2017-03-31 22:43:00 +01:00
Jonathan G Rennison
f4b5efd67d Merge branch 'template_train_replacement' into jgrpp 2017-03-31 14:30:49 +01:00
Jonathan G Rennison
753fc2ab67 TBTR: Fix virtual rail engines not havign build year set. 2017-03-31 14:30:40 +01:00
Jonathan G Rennison
3084cac654 Merge branch 'enhanced_viewport_overlay' into jgrpp 2017-03-31 14:16:01 +01:00
Jonathan G Rennison
f3ed6765a5 Add Ctrl+Click to scroll to plan. 2017-03-31 14:15:36 +01:00
Jonathan G Rennison
a3d21411e7 Add a 'Show All' button to plans GUI. 2017-03-31 14:15:36 +01:00
Jonathan G Rennison
b9e6ad1c6d Plans GUI: Fix various alignment issues. 
Visibility button clicking, double mode, RTL mode, vertical alignment.
 2017-03-31 14:15:36 +01:00
Jonathan G Rennison
ac8b67ba9c Merge branch 'measurement_tool' into jgrpp 2017-03-31 12:12:12 +01:00
Jonathan G Rennison
0172f3acab Fix height above sea-level in measurement tool. 2017-03-31 12:11:20 +01:00
HackaLittleBit
eddd635f00 Chunnel: Make error reporting consistent with tunnel length reporting at cursor. 
Error reporting should be in tune with occurrence of events.
 2017-03-31 01:54:41 +01:00
Jonathan G Rennison
0772236986 Add a release slot at front of train slot action. 
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
 2017-03-31 01:10:26 +01:00
Jonathan G Rennison
870216d27c Show manage slots in veh/group window drop down even when no vehicles. 2017-03-31 00:08:25 +01:00
Jonathan G Rennison
7dbf99fa33 Add UI setting to hide adv tracerestrict features from GUI 
Hide wait at PBS and slot features.
 2017-03-30 23:32:37 +01:00
Jonathan G Rennison
9d0f0967f9 Enabled loading non-SLXI version 2002 tracerestrict savegames. 2017-03-30 22:52:14 +01:00
Jonathan G Rennison
19e5964b31 Bump tracerestrict version due to wait at PBS and slot features. 2017-03-30 22:49:27 +01:00
peter1138
60d4d1db3f (svn r27837) -Fix (r26969): Black remap did nothing in 8bpp-simple blitter. 2017-03-30 21:33:40 +00:00
Jonathan G Rennison
927323dcb1 Add trace restrict slot membership conditional. 2017-03-30 21:53:30 +01:00
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
Jonathan G Rennison
688ee9ac11 Add string control code to consume an argument. 2017-03-30 20:27:03 +01:00
translators
a39bdc14a0 (svn r27836) -Update from Eints: 
catalan: 2 changes by juanjo
 2017-03-30 17:45:36 +00:00
Jonathan G Rennison
7194e19380 Merge branch 'save_ext' into tracerestrict-sx 2017-03-29 19:52:59 +01:00
Jonathan G Rennison
48bbe0325d Merge branch 'cpp-11' into save_ext 2017-03-29 19:49:29 +01:00
Jonathan G Rennison
4e9d4dd80a Add a PreCleanPool() static method to pool item types. 
(cherry picked from commit 87142ed840)
 2017-03-29 19:47:25 +01:00
Jonathan G Rennison
a3034891a1 Add missing include guard for dyn arena alloc header. 2017-03-29 19:46:30 +01:00
Jonathan G Rennison
dd0666c5f4 Add support for save/loading std::strings. 2017-03-29 19:41:06 +01:00
Jonathan G Rennison
2fb822d392 Fix includes and header guards of container functions. 2017-03-29 19:39:55 +01:00
translators
4d3d43a70e (svn r27835) -Update from Eints: 
norwegian (bokmal): 37 changes by eirik174
 2017-03-29 17:45:37 +00:00
peter1138
5bcc54e021 (svn r27834) -Change: Parse extmidi command string for parameters to pass on. 2017-03-29 17:36:46 +00:00
peter1138
4f3c7e74e7 (svn r27833) -Change: Trackdir maps directly to TrackdirBits 2017-03-28 21:44:40 +00:00
Jonathan G Rennison
f58fe00294 Merge branch 'master' into save_ext 2017-03-28 02:26:13 +01:00
Jonathan G Rennison
0430502faa Merge branch 'tracerestrict' into tracerestrict-sx 2017-03-28 02:04:44 +01:00
Jonathan G Rennison
5a2d482c28 Tracerestrict: Add wait at PBS signal action. 2017-03-27 23:30:15 +01:00