ba2e6087b2
Add train cache flag for whether train using realistic braking physics
3 years ago
b514d29db1
Replace TrainCache::cached_tilt with a flags field
3 years ago
8fd4f65a85
Validate lookahead reservation end OK before calling FollowTrainReservation
3 years ago
5b5e068e52
Don't check safe waiting point in FollowTrainReservation if result unused
3 years ago
5c569b1880
Validate TB exit tile when TRLF_TB_EXIT_FREE set in FollowTrainReservation
3 years ago
8646506127
Prevent lookahead init for wrong way movement on signalled tunnel/bridge
3 years ago
b9413ea250
Remove assert from UpdateSignalsOnSegment that globset is empty
...
Just do the right thing if it isn't empty instead of asserting
3 years ago
fb64e29c6c
Fix assertion failure when command triggers PBS tunnel/bridge unreserve
...
In the case where the signal update buffer is not currently empty
3 years ago
35d720b0ad
Add tracerestrict PBS end signal conditional
...
This is for realistic braking long reserve
3 years ago
03f95322ae
Fix CheckCurveLookAhead applying curves just beyond the train length
...
Fix vehicle spacing logic
3 years ago
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
3 years ago
43b0ddc558
Use tile railtype for curve speed look ahead
...
See: 0f91cb04
3 years ago
b711f94d1c
Fix FollowTrainReservation following outwards from end depot
3 years ago
ed0ffb6220
Add feature: realistic train braking
...
Add setting to select train braking model.
3 years ago
65d5d13a08
Avoid unnecessary viewport redrawing when (un)reserving signalled bridges
4 years ago
92ca965ef7
Fix PBS rail type handling with incorrect GRF rail type compatibility
4 years ago
352b361e1b
Viewport: Replace viewport mark dirty if zoom level below with flags param
...
Fix missing flags for tracerestrict and effect vehicles
4 years ago
4108672cf6
Use separate tile hash for each vehicle type
4 years ago
5240b46d1d
Reduce viewport invalidation area of signal state changes
4 years ago
c13ff2a1d3
Reduce viewport invalidation area of track reservation changes
4 years ago
6d30809fc7
Tracerestrict: Add support for signalled tunnel/bridges to PBS entry signal conditional
5 years ago
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
f0ffb52f2f
Fix per-railtype 90 deg turn setting with dual rail type tiles
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
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
cc5f175615
Feature: Railtype flags to allow/disallow 90 degree curves. ( #7352 )
5 years ago
e8b45f0ae4
Ensure correct rail type used in FollowTrainReservation
5 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
e67cd04596
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
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
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
4189cb85ba
Codechange: Use HasTracks with TrackStatus.
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
1b4db7d86c
Trace restrict: Add wait at entrance PBS for reservation ending here
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
1fce82ac04
Merge branch 'tracerestrict-sx' into jgrpp
6 years ago
a9596b45aa
Fix incorrect tile and trackdir in reserve through program execution
6 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
7 years ago
5e30d389af
Merge branch 'signal_tunnels_bridges' into jgrpp
8 years ago
08062096ab
Make back of bridge/tunnel PBS exit a line-end safe waiting point.
8 years ago
f82feb160f
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/misc.cpp
# src/openttd.cpp
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
0d2e9f91bf
Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
...
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
8 years ago
3ea652c4b9
Merge branch 'tracerestrict-sx' into jgrpp
8 years ago
Jonathan G Rennison
S. D. Cloudt
Henry Wilson
Michael Lutz
J0anJosep