Jonathan G Rennison
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
patch-import
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
patch-import
4117808b9d
Import adjacent crossings patch (v3.1)
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=836749#p836749
9 years ago
frosch
bba85a6e01
(svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads.
9 years ago
frosch
beb213f9ee
(svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads.
9 years ago
rubidium
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
rubidium
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
peter1138
d0811746e3
(svn r24906) -Fix (24905): Don't trigger on path reservation for waypoints.
12 years ago
peter1138
fed430b45d
(svn r24906) -Fix (24905): Don't trigger on path reservation for waypoints.
12 years ago
peter1138
1e10e91fde
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
peter1138
c00a400cc7
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
michi_cc
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
michi_cc
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
michi_cc
d65352ed6f
(svn r24071) -Fix [FS#5093]: Reversing trains while they were entering or leaving a depot could lead to stuck trains.
12 years ago
michi_cc
f8b62a3c7a
(svn r24071) -Fix [FS#5093]: Reversing trains while they were entering or leaving a depot could lead to stuck trains.
12 years ago
michi_cc
0e96bd02c8
(svn r23564) -Fix [FS#4888]: Extending a path reservation starting at a partially reserved rail station could fail.
13 years ago
michi_cc
24b7be856b
(svn r23564) -Fix [FS#4888]: Extending a path reservation starting at a partially reserved rail station could fail.
13 years ago
rubidium
701bd8848a
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
rubidium
faf5d899f7
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
michi_cc
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
michi_cc
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
michi_cc
72b15f0c73
(svn r19425) -Fix: [YAPP] A train on a bridge/tunnel was not always found when checking for trains on a reserved path.
15 years ago
michi_cc
8c477604eb
(svn r19425) -Fix: [YAPP] A train on a bridge/tunnel was not always found when checking for trains on a reserved path.
15 years ago
alberth
01562e2dfc
(svn r19272) -Doc: successfull -> successful.
15 years ago
alberth
2ac558494c
(svn r19272) -Doc: successfull -> successful.
15 years ago
rubidium
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
rubidium
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
michi_cc
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
michi_cc
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
michi_cc
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
michi_cc
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
rubidium
5e2a1a46ed
(svn r18420) -Codechange: split YAPF's track follower from the actual YAPF code
15 years ago
rubidium
ad6d8c1f46
(svn r18420) -Codechange: split YAPF's track follower from the actual YAPF code
15 years ago
frosch
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
frosch
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
rubidium
2f3053508d
(svn r18364) -Codechange: move the pathfinders and their related files into a separate directory
15 years ago
rubidium
f52e27c688
(svn r18364) -Codechange: move the pathfinders and their related files into a separate directory
15 years ago
smatz
fa937901cb
(svn r17701) -Codechange: don't start line with a space if it's not inside comment
15 years ago
smatz
6c7f8fc8b4
(svn r17701) -Codechange: don't start line with a space if it's not inside comment
15 years ago
rubidium
982b8ee5fc
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
rubidium
d6cded5380
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
rubidium
310465da07
(svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos
15 years ago
rubidium
e8ddf001c8
(svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos
15 years ago
rubidium
99d46e0ad7
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
rubidium
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
rubidium
196856f54e
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
15 years ago
rubidium
cf38a5bee6
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
15 years ago
rubidium
00a9b2fd3d
(svn r16938) -Codechange: introduce helper function to tell whether a tile is either a rail station or rail waypoint tile
15 years ago
rubidium
2c6b5237f6
(svn r16938) -Codechange: introduce helper function to tell whether a tile is either a rail station or rail waypoint tile
15 years ago
rubidium
100cb17fa8
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
...
-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.
15 years ago
rubidium
68ead6b84f
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
...
-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.
15 years ago
rubidium
9eaee690bc
(svn r16908) -Codechange: s/DepotWaypointReservation/DepotReservation/
15 years ago
rubidium
2646a99d29
(svn r16908) -Codechange: s/DepotWaypointReservation/DepotReservation/
15 years ago
rubidium
f1d6561cc4
(svn r16907) -Codechange: make a more clear distinction between reservation functions that return a bool and that return TrackBits; GetRailStationReservation vs GetRailwayStationReservation, which one returns the bool and which one the TrackBits?
15 years ago
rubidium
8405d7d7e7
(svn r16907) -Codechange: make a more clear distinction between reservation functions that return a bool and that return TrackBits; GetRailStationReservation vs GetRailwayStationReservation, which one returns the bool and which one the TrackBits?
15 years ago
smatz
af85994f7f
(svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check
15 years ago
smatz
0c10006907
(svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check
15 years ago
rubidium
6350648a6c
(svn r16392) -Codechange: move some variables (the ones that aren't caches) from VehicleRail to Train
15 years ago
rubidium
c4b627af42
(svn r16392) -Codechange: move some variables (the ones that aren't caches) from VehicleRail to Train
15 years ago
rubidium
1324100d69
(svn r16391) -Codechange: use Train instead of Vehicle where appropriate.
15 years ago
rubidium
80e94b9bb1
(svn r16391) -Codechange: use Train instead of Vehicle where appropriate.
15 years ago
rubidium
86fc432293
(svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle.
15 years ago
rubidium
441011b782
(svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle.
15 years ago
smatz
05db91dc65
(svn r16349) -Codechange: rename IsPlainRailTile() to IsPlainRail(), introduce shiny new IsPlainRailTile()
15 years ago
smatz
0af27062c4
(svn r16349) -Codechange: rename IsPlainRailTile() to IsPlainRail(), introduce shiny new IsPlainRailTile()
15 years ago
smatz
9021c20b5e
(svn r15299) -Cleanup: remove many redundant includes
16 years ago
smatz
0d3f5e6e74
(svn r15299) -Cleanup: remove many redundant includes
16 years ago
michi_cc
8f5354f2df
(svn r14876) -Fix [FS#2509] (r14849): Reserved path loop detection was broken for stations.
...
Don't set the test tile to the tile the very first iteration handles. Update the test tile instead in the loop.
16 years ago
michi_cc
6138f6a2bb
(svn r14876) -Fix [FS#2509] (r14849): Reserved path loop detection was broken for stations.
...
Don't set the test tile to the tile the very first iteration handles. Update the test tile instead in the loop.
16 years ago
michi_cc
cca22794d1
(svn r14849) -Fix [FS#2478]: A train meeting its end could lead to an endless loop.
16 years ago
michi_cc
809d9bc498
(svn r14849) -Fix [FS#2478]: A train meeting its end could lead to an endless loop.
16 years ago
michi_cc
166793bd93
(svn r14428) -Fix [FS#2306]: A 90-degree curve can be a safe waiting position if they are forbidden for trains.
16 years ago
michi_cc
ba5575e0fc
(svn r14428) -Fix [FS#2306]: A 90-degree curve can be a safe waiting position if they are forbidden for trains.
16 years ago
rubidium
6e67ea1f9d
(svn r14258) -Codechange: rework the way to query the vehicle hash to make sure it always results in the same irregardless of the order of the hash-linked-list.
...
-Fix: desync in PBS reservation following, vehicle flooding and road vehicle overtake/follow code.
16 years ago
rubidium
9474db5cb6
(svn r14258) -Codechange: rework the way to query the vehicle hash to make sure it always results in the same irregardless of the order of the hash-linked-list.
...
-Fix: desync in PBS reservation following, vehicle flooding and road vehicle overtake/follow code.
16 years ago
smatz
c45a143e27
(svn r14109) -Fix (r14107): marking reserved tile dirty is needed for waypoints and stations even when patch option is disabled
16 years ago
smatz
5d5cb04297
(svn r14109) -Fix (r14107): marking reserved tile dirty is needed for waypoints and stations even when patch option is disabled
16 years ago
smatz
506a6ffe57
(svn r14107) -Codechange: marking reserved tile dirty twice (and even when patch option is off) is not needed
16 years ago
smatz
999994bcf3
(svn r14107) -Codechange: marking reserved tile dirty twice (and even when patch option is off) is not needed
16 years ago
frosch
ba1b3c7f11
(svn r13974) -Fix [YAPP]: A train crash could lead to stale reservations. (michi_cc)
16 years ago
frosch
983e297ff0
(svn r13974) -Fix [YAPP]: A train crash could lead to stale reservations. (michi_cc)
16 years ago
rubidium
1e549a0fcc
(svn r13966) -Codechange [YAPP]: Bar level crossings upon path reservation. (michi_cc)
16 years ago
rubidium
bba8ff290e
(svn r13966) -Codechange [YAPP]: Bar level crossings upon path reservation. (michi_cc)
16 years ago
rubidium
2a567afff4
(svn r13965) -Add [YAPP]: Implement newgrf var 0x44 for stations (PBS reservation state). (michi_cc)
16 years ago
rubidium
88b1ee0b43
(svn r13965) -Add [YAPP]: Implement newgrf var 0x44 for stations (PBS reservation state). (michi_cc)
16 years ago
rubidium
bcfc5a78ed
(svn r13956) -Add [YAPP]: Function for getting the train holding a reserved path. (michi_cc)
16 years ago
rubidium
bce6f7b41c
(svn r13956) -Add [YAPP]: Function for getting the train holding a reserved path. (michi_cc)
16 years ago
rubidium
74b770a96a
(svn r13940) -Add [YAPP]: YAPF is now able to reserve the found path. (michi_cc)
16 years ago
rubidium
abc46b1e86
(svn r13940) -Add [YAPP]: YAPF is now able to reserve the found path. (michi_cc)
16 years ago
rubidium
8ffc05a02c
(svn r13929) -Codechange [YAPP]: Reserving and unreserving of single tracks is now possible. (michi_cc)
16 years ago
rubidium
f6555cf6f8
(svn r13929) -Codechange [YAPP]: Reserving and unreserving of single tracks is now possible. (michi_cc)
16 years ago
rubidium
8eb9c27f8d
(svn r13928) -Add [YAPP]: Function for getting the path reservation state of any tile. (michi_cc)
16 years ago
rubidium
2bb8825538
(svn r13928) -Add [YAPP]: Function for getting the path reservation state of any tile. (michi_cc)
16 years ago