dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,785 Commits 1 Branch 0 Tags
b514d29db1dd8dc7c704dae2e2c4928a1ec6ba8d
Commit Graph

1780 Commits

Author SHA1 Message Date
Jonathan G Rennison
d730cfd51d Cache sprite sequence bounds for vehicles 2018-01-19 19:13:01 +00:00
Jonathan G Rennison
dda20d08c1 Merge branch 'improved_breakdowns' into jgrpp 
Update German and Korean language strings

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 2018-01-04 19:47:46 +00:00
Jonathan G Rennison
beda7ebb39 Set minimum speed for train critical breakdown reduction. 2018-01-04 19:05:18 +00:00
Jonathan G Rennison
4b392b66db Fix DeleteVisibleTrain being called on virtual trains 
Add assertion to check for this case
 2017-12-31 14:29:15 +00:00
Jonathan G Rennison
1c04653518 Add scope info logging to DeleteVisibleTrain 2017-12-31 14:23:33 +00:00
Jonathan G Rennison
9559ad4946 Merge branch 'template_train_replacement' into jgrpp 2017-09-23 11:40:07 +01:00
Jonathan G Rennison
40c99956ed TBTR: Fix attempting to get sprite for new virtual engine before marking as virtual 2017-09-23 11:39:59 +01:00
Jonathan G Rennison
ba33754993 Merge branch 'save_ext' into tracerestrict-sx 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:28:30 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
Jonathan G Rennison
2d66f25f6c Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/vehicle.cpp
 2017-08-15 19:17:12 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
b76d594654 Merge branch 'adjacent_crossings' into jgrpp 
# Conflicts:
#	src/road_func.h
 2017-07-20 01:07:52 +01:00
Jonathan G Rennison
3e85e9fc53 Fix MaybeBarCrossingWithSound setting crossing reservation 
Improve efficiency of adjacent crossings checks
 2017-07-20 01:07:02 +01:00
Jonathan G Rennison
bbd2e6f2f5 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
 2017-06-06 21:08:37 +01:00
Jonathan G Rennison
350c2bb24f Make trains break down after collision with road vehicle. 2017-06-06 20:20:33 +01:00
Jonathan G Rennison
44fa555c6d Merge branch 'save_ext' into improved_breakdowns 2017-06-06 18:41:01 +01:00
Jonathan G Rennison
0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 2017-05-07 19:33:59 +01:00
Jonathan G Rennison
4979309094 TBTR: Fix build and refit of template trains. 2017-04-26 19:09:57 +01:00
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
40eff50c98 Clear waiting due to tracerestrict flag when no longer required. 2017-04-04 00:39:46 +01: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
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
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
Jonathan G Rennison
5a2d482c28 Tracerestrict: Add wait at PBS signal action. 2017-03-27 23:30:15 +01:00
Jonathan G Rennison
c882082467 Chunnel: Fix swap of vehicle chunnel flag when reversing consist. 2017-03-27 18:34:55 +01:00
Jonathan G Rennison
efe30c4299 Merge branch 'tracerestrict-sx' into jgrpp 2017-03-20 19:20:19 +00:00
Jonathan G Rennison
2af2a49887 Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation" 
This reverts commit 166e504c13.

These parameters are used for tracerestrict functionality.
 2017-03-20 19:16:32 +00:00
Jonathan G Rennison
f9f2d37a8e Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/saveload/saveload.cpp
 2017-03-20 19:14:48 +00:00
Jonathan G Rennison
fc60857b66 Merge branches 'adjacent_crossings' and 'zoning' into jgrpp 2017-03-20 19:06:09 +00:00
Jonathan G Rennison
0c42b384bc Merge branch 'save_ext' into adjacent_crossings 
# Conflicts:
#	src/train_cmd.cpp
 2017-03-20 18:48:12 +00:00
peter1138
166e504c13 (svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation 
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
 2017-03-20 17:49:44 +00:00
peter1138
5951d2406e (svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation 
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
 2017-03-20 17:49:44 +00:00
peter1138
040df26e9e (svn r27809) -Codechange: Improve check in UpdateLevelCrossing 
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
 2017-03-20 08:04:47 +00:00
peter1138
67ab0450dd (svn r27809) -Codechange: Improve check in UpdateLevelCrossing 
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
 2017-03-20 08:04:47 +00:00
Jonathan G Rennison
ec9f0371e8 Chunnel: Adjust z position of vehicles in chunnels to go "under" the water. 2017-03-05 18:05:04 +00:00
Jonathan G Rennison
f3bea35fcc Merge branches 'template_train_replacement' and 'infrastructure_sharing' into jgrpp 2017-01-24 19:49:01 +00:00
Jonathan G Rennison
11e4bcee40 Slightly decrease proximity required for trains to crash. 
This is to fix trains of different companies being able to crash when
two stations or line-ends are directly against each other.
 2017-01-24 19:47:13 +00:00
Jonathan G Rennison
f5e4d8e73a Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
 2017-01-17 19:20:46 +00:00
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/train_cmd.cpp
 2017-01-02 18:13:45 +00:00
Jonathan G Rennison
074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 2016-12-28 15:06:08 +00:00
Jonathan G Rennison
66751457ad Fix train crash on bridge/tunnel with signals leaving red signals. 
Update signals on far end of bridge/tunnel.
If clearing the crash results in a clear bridge/tunnel, set all
bridge/tunnel signals green.
 2016-12-18 18:09:48 +00:00
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
Jonathan G Rennison
92254acf8d TBTR: Savegame and API changes to support multiple sprites per vehicle. 2016-11-01 20:27:30 +00:00
Jonathan G Rennison
d204062300 Merge branch 'master' into template_train_replacement 2016-11-01 19:43:35 +00:00
frosch
a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 2016-10-16 14:58:38 +00:00