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
1e5c788541
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/table/settings.ini
# src/tunnelbridge.h
8 years ago
d762835903
Signals on tunnel/bridges are now added to infrastructure stats.
8 years ago
169a979737
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
Conflicts:
src/tunnelbridge.h
(Fixup zoom level changes).
9 years ago
b3e03e8cf9
Fix middle of bridge not being redrawn when adding removing signals.
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
bd3a8bf9e4
(svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges.
9 years ago
87272273b5
(svn r22405) -Document: some more "random-ish" tidbits
13 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
99d46e0ad7
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
d46d8d9c9d
(svn r12765) -Codechange: move some stuff out of variables.h that required including other headers in variables.h.
16 years ago
74af65e556
(svn r11968) -Codechange: remove redundant FindLengthOfTunnel(), use GetTunnelBridgeLength() and/or GetOtherTunnelEnd() instead
17 years ago
Jonathan G Rennison
frosch
rubidium
smatz