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
3 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
3d6cbb76b4
Allow value of "PBS entry signal" conditional to be a rail depot.
8 years ago
cf59b4fcab
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
8 years ago
17f74e4c51
Fix signalled bridge/tunnel not always being redrawn on (un)reservation.
8 years ago
3ae94d857c
Fix FindTrainOnTrackEnum finding trains inside signalled bridge/tunnels.
...
Now only find trains on the given entrance/exit tile.
This fixes trains not leaving stations by PBS into non-empty signalled
bridge/tunnels.
8 years ago
5d42d07988
Merge branch 'tracerestrict-sx' into jgrpp
8 years ago
1bb3024534
Fix unreserving through a green PBS signal not setting the state to red.
...
This also had the side effect of failed reservation attempts through
a reserve-through signal leaving the signal erroneously set to green.
8 years ago
d08b162119
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/signal.cpp
# src/train_cmd.cpp
8 years ago
35b93a42ac
Enable bridge/tunnel exit signals to be one-way PBS.
...
Add signal conversion support.
8 years ago
a25ac7a161
Enable signals on bridges/tunnels to work with PBS.
8 years ago
73e8c32a5d
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/tracerestrict.h
src/tracerestrict_gui.cpp
src/train_cmd.cpp
8 years ago
82cab7f31c
Tracerestrict: Import "Long Reserve" feature.
...
https://github.com/KeldorKatarn/OpenTTD_PatchPack
Minor code de-duplications.
8 years ago
6bd9f09e97
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
776c93ca55
Fix use of nullptr, which broke compilation on legacy compilers.
9 years ago
3dec3242cc
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
e2435c7169
Only run trace restrict programs if they contain relevant actions.
...
Only run in pathfinder case if deny or penalty are present.
Only run in is safe waiting tile case is reserve through is present.
Presence is determined at program validation time and cached in the
program structure.
Validator now checks for unknown non-conditional instructions.
9 years ago
06a1d7c5c9
Add reserve through action to trace restrict programs.
...
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
4117808b9d
Import adjacent crossings patch (v3.1)
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=836749#p836749
9 years ago
bba85a6e01
(svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads.
9 years ago
beb213f9ee
(svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads.
9 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
d0811746e3
(svn r24906) -Fix (24905): Don't trigger on path reservation for waypoints.
12 years ago
fed430b45d
(svn r24906) -Fix (24905): Don't trigger on path reservation for waypoints.
12 years ago
1e10e91fde
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
c00a400cc7
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
72f1a84a6c
(svn r24078) -Fix [FS#5093,FS#5130] (r24071): A fix that breaks all other cases isn't really a fix. Redo it to make sure that reservations of trains entering or exiting depots are properly made and freed.
12 years ago
7e438d27f1
(svn r24078) -Fix [FS#5093,FS#5130] (r24071): A fix that breaks all other cases isn't really a fix. Redo it to make sure that reservations of trains entering or exiting depots are properly made and freed.
12 years ago
d65352ed6f
(svn r24071) -Fix [FS#5093]: Reversing trains while they were entering or leaving a depot could lead to stuck trains.
12 years ago
f8b62a3c7a
(svn r24071) -Fix [FS#5093]: Reversing trains while they were entering or leaving a depot could lead to stuck trains.
12 years ago
0e96bd02c8
(svn r23564) -Fix [FS#4888]: Extending a path reservation starting at a partially reserved rail station could fail.
13 years ago
24b7be856b
(svn r23564) -Fix [FS#4888]: Extending a path reservation starting at a partially reserved rail station could fail.
13 years ago
701bd8848a
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
faf5d899f7
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
8ac286f229
(svn r20156) -Fix [FS#3937]: [YAPP] Converting a one-way block to a path signal with trains on both sides could lead to a train crash.
14 years ago
9e93ee3a45
(svn r20156) -Fix [FS#3937]: [YAPP] Converting a one-way block to a path signal with trains on both sides could lead to a train crash.
14 years ago
72b15f0c73
(svn r19425) -Fix: [YAPP] A train on a bridge/tunnel was not always found when checking for trains on a reserved path.
14 years ago
8c477604eb
(svn r19425) -Fix: [YAPP] A train on a bridge/tunnel was not always found when checking for trains on a reserved path.
14 years ago
01562e2dfc
(svn r19272) -Doc: successfull -> successful.
14 years ago
2ac558494c
(svn r19272) -Doc: successfull -> successful.
14 years ago
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
6c737cf108
(svn r18648) -Fix/Feature [FS#3430-ish]: [YAPP] Treat the backside of an one-way path signals as a safe waiting point.
15 years ago
40ba9933dc
(svn r18648) -Fix/Feature [FS#3430-ish]: [YAPP] Treat the backside of an one-way path signals as a safe waiting point.
15 years ago
3ecd08be01
(svn r18647) -Fix: [YAPP] A train inside a station was not always found when checking for trains on a reserved path.
15 years ago
f7025612e1
(svn r18647) -Fix: [YAPP] A train inside a station was not always found when checking for trains on a reserved path.
15 years ago
5e2a1a46ed
(svn r18420) -Codechange: split YAPF's track follower from the actual YAPF code
15 years ago
ad6d8c1f46
(svn r18420) -Codechange: split YAPF's track follower from the actual YAPF code
15 years ago
5a775cb93f
(svn r18392) -Fix (r13956)[FS#3345]: [YAPP] Trains on bridges were not found, when searching for the origin of a reservation. (Hirundo)
15 years ago
f4931ef4a2
(svn r18392) -Fix (r13956)[FS#3345]: [YAPP] Trains on bridges were not found, when searching for the origin of a reservation. (Hirundo)
15 years ago
2f3053508d
(svn r18364) -Codechange: move the pathfinders and their related files into a separate directory
15 years ago
f52e27c688
(svn r18364) -Codechange: move the pathfinders and their related files into a separate directory
15 years ago
fa937901cb
(svn r17701) -Codechange: don't start line with a space if it's not inside comment
15 years ago
6c7f8fc8b4
(svn r17701) -Codechange: don't start line with a space if it's not inside comment
15 years ago
982b8ee5fc
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
Jonathan G Rennison
S. D. Cloudt
Henry Wilson
Michael Lutz
J0anJosep
patch-import
frosch
rubidium
peter1138
planetmaker
michi_cc
alberth
smatz