7bc010d402
Avoid unnecessary calls to InvalidateVehicleTickCaches
...
Don't call from Train::ConsistChanged
5 years ago
3b55f5d765
Cache whether ground vehicles currently have 0 slope resistance
5 years ago
7ae2aa93ea
Allow trains to reverse in station when front is in a bridge/tunnel
6 years ago
f64cb4048e
Fix trains not reversing in station when front is on a diagonal rail piece
6 years ago
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
6 years ago
ec736d8b40
Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )"
...
This reverts commit e934f09f02
6 years ago
029c48cf4a
Cleanup: [NPF] Remove unused parameter.
6 years ago
96c5e5e73a
Cleanup: [NPF] Remove unused parameters.
6 years ago
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
6 years ago
a47c4c781c
Restore gv_flags when aborting train entering/exiting wormhole
...
This fixes train disconnecting when reversing at the end of a
sloped bridge ramp due to heading the wrong way onto a signalled bridge.
6 years ago
37adf9be4a
Cache the last vehicle in a consist to have a visual effect
6 years ago
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
6 years ago
e15601e12f
Cache whether a train may have a depot or bridge speed restriction
6 years ago
d87ac8ec7e
Improve performance of train breakdown detection
6 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
6 years ago
96854b2b8b
Codechange #5859 : Simplify CheckTrainStayInDepot() ( #7045 )
6 years ago
e934f09f02
Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )
6 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
cd41683b9b
Add tracerestrict feature reverse behind signal
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
bb7353c02a
Codechange: Some more null checks
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
c4f5c8e789
TBTR: Add option to replace only old vehicles
6 years ago
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
6 years ago
16a245ccab
Merge branch 'signal_tunnels_bridges' into jgrpp
6 years ago
9638d22ff7
Fix clearing wrong M2 bit in GetAndClearLastBridgeEntranceSetSignalIndex
6 years ago
23cfd4709c
Merge branch 'signal_tunnels_bridges' into jgrpp
6 years ago
a0ef4ea760
Fix incorrect signal offsets in GetAndClearLastBridgeEntranceSetSignalIndex
...
Fixes #65
6 years ago
f59535c0b7
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
60cc1a48ac
Refresh trace restrict slots window as with the train list window
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
f13b686d0c
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/train_cmd.cpp
6 years ago
1b9775479d
Fix incorrect vehicle alignment when entering bridge from W,N directions
6 years ago
a87720ca06
Fix train bounding box/delta not being updated when entering bridge from 45° angle
6 years ago
649118c928
Fix assertion failure when deleting train from signalled tunnel/bridge
6 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
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
6 years ago
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.
6 years ago
e67cd04596
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
6ca0fcbae2
Use head tile track pieces in Train::GetVehicleTrackdir for trains in wormhole
6 years ago
a7e767d766
Fix 90° turns being wrongly detected across bridges of non-zero length
...
This prevented reservations
6 years ago
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
6 years ago
77362b829a
Initial support for rail custom bridge heads
6 years ago
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
6 years ago
2586096ef6
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
e9f5d80440
Trace restrict slots: Add support for slot operations at PBS end signal
6 years ago
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
6 years ago
814f9f7e0f
Implement bidirectional mode for signals on bridges/tunnels
6 years ago
d03139b241
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
6 years ago
c2a7728084
Fix: Prevent ships moving into docks after finishing (un)loading. ( #6791 )
6 years ago
cecbf257bc
Merge branch 'save_ext' into template_train_replacement
...
# Conflicts:
# src/saveload/saveload.cpp
# src/vehicle_gui.cpp
6 years ago
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
6 years ago
a07394a63a
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. ( #6792 )
...
The value is either unused or always the same as this->direction.
6 years ago
a60eff174d
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
5877cd0f9b
TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes
...
Slight code, GUI layout, and savegame format tidying
6 years ago
e0126a1fbc
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
0dd3ff23de
Fix signalled tunnel/bridge entrance not being marked dirty when reservation cleared
6 years ago
c2678b896e
Fix clearing of train reservations in tunnels and on bridges.
...
(cherry picked from commit e2c4fb517d1064b163d8f2b0627506d785ffb3ed)
See: #46
6 years ago
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
6 years ago
c779915ccb
Fix train through load always advancing last section to far end of platform
6 years ago
f012d45491
Merge branch 'signal_tunnels_bridges' into jgrpp
6 years ago
df72bc6e09
Fix signal on tun/bridge gradual decel end tile detection
6 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
09ca051ff8
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train.h
6 years ago
def3a3933b
Move dual-use of load_unload_ticks for bridge/tun signals to new field
6 years ago
10db379202
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
38cb80872b
Gradually slow down for red signals on bridges/tunnels
...
Instead of coming to a sudden halt immediately before the signal
6 years ago
8a4d462d44
Merge branch 'chunnel' into jgrpp
6 years ago
d5a316e365
Use flag GVF_CHUNNEL_BIT properly
6 years ago
ec661d7ae9
Merge branch 'template_train_replacement' into jgrpp
7 years ago
4a9df57665
TBTR: Enable autorenew when template replacement active
7 years ago
06a2457efc
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
233b0f8e9e
TBTR: Add sanity check assertions
7 years ago
bb6b8d8cd6
Increase verbosity of some assertion failure messages
7 years ago
d730cfd51d
Cache sprite sequence bounds for vehicles
7 years ago
dda20d08c1
Merge branch 'improved_breakdowns' into jgrpp
...
Update German and Korean language strings
# Conflicts:
# src/saveload/extended_ver_sl.cpp
7 years ago
beda7ebb39
Set minimum speed for train critical breakdown reduction.
7 years ago
4b392b66db
Fix DeleteVisibleTrain being called on virtual trains
...
Add assertion to check for this case
7 years ago
1c04653518
Add scope info logging to DeleteVisibleTrain
7 years ago
9559ad4946
Merge branch 'template_train_replacement' into jgrpp
7 years ago
40c99956ed
TBTR: Fix attempting to get sprite for new virtual engine before marking as virtual
7 years ago
ba33754993
Merge branch 'save_ext' into tracerestrict-sx
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
2d66f25f6c
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/vehicle.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
b76d594654
Merge branch 'adjacent_crossings' into jgrpp
...
# Conflicts:
# src/road_func.h
7 years ago
3e85e9fc53
Fix MaybeBarCrossingWithSound setting crossing reservation
...
Improve efficiency of adjacent crossings checks
7 years ago
bbd2e6f2f5
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
7 years ago
350c2bb24f
Make trains break down after collision with road vehicle.
7 years ago
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
7 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
7 years ago
4979309094
TBTR: Fix build and refit of template trains.
7 years ago
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
7 years ago
4d21d6f81c
Merge branch 'chunnel' into jgrpp
7 years ago
40eff50c98
Clear waiting due to tracerestrict flag when no longer required.
7 years ago
85c7c4b307
Merge branch 'signal_tunnels_bridges' into jgrpp
7 years ago
ab595bf67c
Fix bridge/tunnel exit PBS signals never being set to green.
7 years ago
f4b5efd67d
Merge branch 'template_train_replacement' into jgrpp
7 years ago
Jonathan G Rennison
J0an Josep
Andy
Charles Pigott
Niels Martin Hansen
PeterN
keldorkatarn
HackaLittleBit
frosch