Jonathan G Rennison
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
6 years ago
Jonathan G Rennison
e15601e12f
Cache whether a train may have a depot or bridge speed restriction
6 years ago
Jonathan G Rennison
d87ac8ec7e
Improve performance of train breakdown detection
6 years ago
Jonathan G Rennison
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
Joan Josep
96854b2b8b
Codechange #5859 : Simplify CheckTrainStayInDepot() ( #7045 )
6 years ago
Andy
e934f09f02
Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )
6 years ago
Jonathan G Rennison
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
Jonathan G Rennison
cd41683b9b
Add tracerestrict feature reverse behind signal
6 years ago
Jonathan G Rennison
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
Charles Pigott
bb7353c02a
Codechange: Some more null checks
6 years ago
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
Jonathan G Rennison
c4f5c8e789
TBTR: Add option to replace only old vehicles
6 years ago
Jonathan G Rennison
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
6 years ago
Jonathan G Rennison
16a245ccab
Merge branch 'signal_tunnels_bridges' into jgrpp
6 years ago
Jonathan G Rennison
9638d22ff7
Fix clearing wrong M2 bit in GetAndClearLastBridgeEntranceSetSignalIndex
6 years ago
Jonathan G Rennison
23cfd4709c
Merge branch 'signal_tunnels_bridges' into jgrpp
6 years ago
Jonathan G Rennison
a0ef4ea760
Fix incorrect signal offsets in GetAndClearLastBridgeEntranceSetSignalIndex
...
Fixes #65
6 years ago
Jonathan G Rennison
f59535c0b7
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
Jonathan G Rennison
60cc1a48ac
Refresh trace restrict slots window as with the train list window
6 years ago
Jonathan G Rennison
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
Jonathan G Rennison
f13b686d0c
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/train_cmd.cpp
6 years ago
Jonathan G Rennison
1b9775479d
Fix incorrect vehicle alignment when entering bridge from W,N directions
6 years ago
Jonathan G Rennison
a87720ca06
Fix train bounding box/delta not being updated when entering bridge from 45° angle
6 years ago
Jonathan G Rennison
649118c928
Fix assertion failure when deleting train from signalled tunnel/bridge
6 years ago
Jonathan G Rennison
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
Jonathan G Rennison
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
Niels Martin Hansen
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
Jonathan G Rennison
e67cd04596
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
Jonathan G Rennison
6ca0fcbae2
Use head tile track pieces in Train::GetVehicleTrackdir for trains in wormhole
6 years ago
Jonathan G Rennison
a7e767d766
Fix 90° turns being wrongly detected across bridges of non-zero length
...
This prevented reservations
6 years ago
Jonathan G Rennison
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
Jonathan G Rennison
77362b829a
Initial support for rail custom bridge heads
6 years ago
Jonathan G Rennison
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
Jonathan G Rennison
2586096ef6
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
Jonathan G Rennison
e9f5d80440
Trace restrict slots: Add support for slot operations at PBS end signal
6 years ago
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
6 years ago
Jonathan G Rennison
814f9f7e0f
Implement bidirectional mode for signals on bridges/tunnels
6 years ago
Jonathan G Rennison
d03139b241
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
6 years ago
PeterN
c2a7728084
Fix: Prevent ships moving into docks after finishing (un)loading. ( #6791 )
6 years ago
Jonathan G Rennison
cecbf257bc
Merge branch 'save_ext' into template_train_replacement
...
# Conflicts:
# src/saveload/saveload.cpp
# src/vehicle_gui.cpp
6 years ago
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
6 years ago
PeterN
a07394a63a
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. ( #6792 )
...
The value is either unused or always the same as this->direction.
6 years ago
Jonathan G Rennison
a60eff174d
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
Jonathan G Rennison
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
Jonathan G Rennison
e0126a1fbc
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
7 years ago
Jonathan G Rennison
0dd3ff23de
Fix signalled tunnel/bridge entrance not being marked dirty when reservation cleared
7 years ago
keldorkatarn
c2678b896e
Fix clearing of train reservations in tunnels and on bridges.
...
(cherry picked from commit e2c4fb517d1064b163d8f2b0627506d785ffb3ed)
See: #46
7 years ago
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