Commit Graph

872 Commits (fc8779dc3db983f97927e6c0a6ecc97654fb36fe)

Author SHA1 Message Date
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
7 years ago
Jonathan G Rennison c779915ccb Fix train through load always advancing last section to far end of platform 7 years ago
Jonathan G Rennison f012d45491 Merge branch 'signal_tunnels_bridges' into jgrpp 7 years ago
Jonathan G Rennison df72bc6e09 Fix signal on tun/bridge gradual decel end tile detection 7 years ago
Jonathan G Rennison 78838ee2a2 Add freight train load/unload mode: through load 7 years ago
Jonathan G Rennison 09ca051ff8 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train.h
7 years ago
Jonathan G Rennison def3a3933b Move dual-use of load_unload_ticks for bridge/tun signals to new field 7 years ago
Jonathan G Rennison 10db379202 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/train_cmd.cpp
7 years ago
Jonathan G Rennison 38cb80872b Gradually slow down for red signals on bridges/tunnels
Instead of coming to a sudden halt immediately before the signal
7 years ago
Jonathan G Rennison 8a4d462d44 Merge branch 'chunnel' into jgrpp 7 years ago
HackaLittleBit d5a316e365 Use flag GVF_CHUNNEL_BIT properly 7 years ago
Jonathan G Rennison ec661d7ae9 Merge branch 'template_train_replacement' into jgrpp 7 years ago
Jonathan G Rennison 4a9df57665 TBTR: Enable autorenew when template replacement active 7 years ago
Jonathan G Rennison 06a2457efc Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/vehicle.cpp
7 years ago
Jonathan G Rennison 233b0f8e9e TBTR: Add sanity check assertions 7 years ago
Jonathan G Rennison bb6b8d8cd6 Increase verbosity of some assertion failure messages 7 years ago
Jonathan G Rennison d730cfd51d Cache sprite sequence bounds for vehicles 7 years ago
Jonathan G Rennison dda20d08c1 Merge branch 'improved_breakdowns' into jgrpp
Update German and Korean language strings

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
7 years ago
Jonathan G Rennison beda7ebb39 Set minimum speed for train critical breakdown reduction. 7 years ago
Jonathan G Rennison 4b392b66db Fix DeleteVisibleTrain being called on virtual trains
Add assertion to check for this case
7 years ago
Jonathan G Rennison 1c04653518 Add scope info logging to DeleteVisibleTrain 7 years ago
Jonathan G Rennison 9559ad4946 Merge branch 'template_train_replacement' into jgrpp 7 years ago
Jonathan G Rennison 40c99956ed TBTR: Fix attempting to get sprite for new virtual engine before marking as virtual 7 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
7 years ago
Jonathan G Rennison 2d66f25f6c Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/vehicle.cpp
7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison b76d594654 Merge branch 'adjacent_crossings' into jgrpp
# Conflicts:
#	src/road_func.h
7 years ago
Jonathan G Rennison 3e85e9fc53 Fix MaybeBarCrossingWithSound setting crossing reservation
Improve efficiency of adjacent crossings checks
7 years ago
Jonathan G Rennison bbd2e6f2f5 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
7 years ago
Jonathan G Rennison 350c2bb24f Make trains break down after collision with road vehicle. 7 years ago
Jonathan G Rennison 44fa555c6d Merge branch 'save_ext' into improved_breakdowns 7 years ago
Jonathan G Rennison 0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 8 years ago
Jonathan G Rennison 4979309094 TBTR: Fix build and refit of template trains. 8 years ago
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
8 years ago
Jonathan G Rennison 4d21d6f81c Merge branch 'chunnel' into jgrpp 8 years ago
Jonathan G Rennison 40eff50c98 Clear waiting due to tracerestrict flag when no longer required. 8 years ago
Jonathan G Rennison 85c7c4b307 Merge branch 'signal_tunnels_bridges' into jgrpp 8 years ago
Jonathan G Rennison ab595bf67c Fix bridge/tunnel exit PBS signals never being set to green. 8 years ago
Jonathan G Rennison f4b5efd67d Merge branch 'template_train_replacement' into jgrpp 8 years ago
Jonathan G Rennison 753fc2ab67 TBTR: Fix virtual rail engines not havign build year set. 8 years ago
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.
8 years ago
Jonathan G Rennison 6417fb16c3 Initial implementation of trace restrict slots 8 years ago
Jonathan G Rennison 5a2d482c28 Tracerestrict: Add wait at PBS signal action. 8 years ago
Jonathan G Rennison c882082467 Chunnel: Fix swap of vehicle chunnel flag when reversing consist. 8 years ago
Jonathan G Rennison efe30c4299 Merge branch 'tracerestrict-sx' into jgrpp 8 years ago
Jonathan G Rennison 2af2a49887 Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation"
This reverts commit 166e504c13.

These parameters are used for tracerestrict functionality.
8 years ago
Jonathan G Rennison f9f2d37a8e Merge branch 'master' into tracerestrict
# Conflicts:
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison fc60857b66 Merge branches 'adjacent_crossings' and 'zoning' into jgrpp 8 years ago
Jonathan G Rennison 0c42b384bc Merge branch 'save_ext' into adjacent_crossings
# Conflicts:
#	src/train_cmd.cpp
8 years ago
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)
8 years ago