Jonathan G Rennison
9d861fb8a0
TBTR: Allow cloning virtual/template trains with unavailable engines
5 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
Henry Wilson
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
Henry Wilson
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
Henry Wilson
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
Jonathan G Rennison
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
5 years ago
Michael Lutz
cc5f175615
Feature: Railtype flags to allow/disallow 90 degree curves. ( #7352 )
5 years ago
Jonathan G Rennison
5be04b6427
Fix wrong track piece being used in ConsistChanged after a rail type change
5 years ago
Jonathan G Rennison
635ee89b86
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/economy.cpp
5 years ago
Jonathan G Rennison
664ecdcb89
Revert "Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )""
...
This reverts commit ec736d8b40
.
See 690d1dd6a4
.
5 years ago
Michael Lutz
690d1dd6a4
Fix #7159 , e934f09: Waiting time at red one-way signals was too short.
...
This is not an exact fix as previously, the wait time was speed/acceleration dependant. This simple fix ignores that and just makes the 'days' from the settings comment to be actually days.
5 years ago
Jonathan G Rennison
8ec9f5e174
Fix case where trains were unable to exit signalled bridge/tunnels
5 years ago
Jonathan G Rennison
7bc010d402
Avoid unnecessary calls to InvalidateVehicleTickCaches
...
Don't call from Train::ConsistChanged
5 years ago
Jonathan G Rennison
3b55f5d765
Cache whether ground vehicles currently have 0 slope resistance
5 years ago
Jonathan G Rennison
7ae2aa93ea
Allow trains to reverse in station when front is in a bridge/tunnel
5 years ago
Jonathan G Rennison
f64cb4048e
Fix trains not reversing in station when front is on a diagonal rail piece
5 years ago
Jonathan G Rennison
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
5 years ago
Jonathan G Rennison
ec736d8b40
Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )"
...
This reverts commit e934f09f02
.
5 years ago
J0an Josep
029c48cf4a
Cleanup: [NPF] Remove unused parameter.
6 years ago
J0an Josep
96c5e5e73a
Cleanup: [NPF] Remove unused parameters.
6 years ago
Jonathan G Rennison
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
6 years ago
Jonathan G Rennison
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
Jonathan G Rennison
37adf9be4a
Cache the last vehicle in a consist to have a visual effect
6 years ago
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