Jonathan G Rennison
8edf5e0a34
Special case OpenGFX as a "base" set to allow recolouring signals.
2015-12-08 21:40:04 +00:00
Jonathan G Rennison
5b1fe71552
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/rail_cmd.cpp
2015-11-24 20:30:19 +00:00
Jonathan G Rennison
4d484a858f
Fix attempts to recolour signal sprites from GRFs.
2015-11-24 19:59:40 +00:00
Jonathan G Rennison
169a979737
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
Conflicts:
src/tunnelbridge.h
(Fixup zoom level changes).
2015-11-01 14:07:55 +00:00
Jonathan G Rennison
95a329a4b9
Fix signals on far side of bridge not being updated when adding/removing signals.
2015-11-01 14:05:50 +00:00
Jonathan G Rennison
b3e03e8cf9
Fix middle of bridge not being redrawn when adding removing signals.
2015-11-01 14:05:22 +00:00
Jonathan G Rennison
e07e4fdb8e
Merge branch 'master' into signal_tunnels_bridges
2015-11-01 14:02:13 +00:00
Jonathan G Rennison
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
2015-10-31 10:53:00 +00:00
Jonathan G Rennison
3b60379a42
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
2015-10-31 01:31:48 +00:00
Jonathan G Rennison
5d774e5844
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
2015-10-31 01:31:38 +00:00
Jonathan G Rennison
654afdc113
Fix removing signals from bridges not updating adjacent signals.
...
Fix minor whitespace/code issues.
2015-10-31 01:30:08 +00:00
frosch
ade25fff71
(svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window.
2015-10-30 17:24:30 +00:00
frosch
2d636266f5
(svn r27427) -Fix: Use the NewGRF railtype sorting order in the infrastructure window.
2015-10-30 17:24:30 +00:00
Jonathan G Rennison
6c5b86bd21
Merge branch 'progsig-sx' into jgrpp
2015-10-03 14:34:01 +01:00
Jonathan G Rennison
0577d7cbf8
progsig: Fix test remove rail action clearing signal programs.
...
This could be triggered by using shift, using the land info window, etc.
2015-10-03 14:28:47 +01:00
Jonathan G Rennison
e257b23cba
Merge branch 'tracerestrict-sx' into jgrpp
2015-08-25 18:26:52 +01:00
Jonathan G Rennison
38aaf8a921
Fix compilation on legacy compilers.
2015-08-25 18:22:18 +01:00
Jonathan G Rennison
f2d0c3a441
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/gfxinit.cpp
src/rail_cmd.cpp
src/table/sprites.h
2015-08-20 00:39:26 +01:00
Jonathan G Rennison
8faead7e7a
Graphically indicate restricted signals by recolouring the signal post.
...
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
2015-08-19 21:56:22 +01:00
Jonathan G Rennison
55af40c456
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
2015-08-16 17:34:04 +01:00
Jonathan G Rennison
a5f00c1df5
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
2015-08-16 17:33:11 +01:00
Jonathan G Rennison
20f1f48983
Fix add/removing signals on bridges/tunnels not checking train occupancy.
...
Fix compiler warning.
2015-08-16 17:31:34 +01:00
Jonathan G Rennison
29c4f244f3
Merge branch 'master' into tracerestrict
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
2015-08-15 00:28:14 +01:00
Jonathan G Rennison
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
2015-08-05 21:54:11 +01:00
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
2015-08-05 21:25:13 +01:00
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
2015-08-05 21:24:30 +01:00
Jonathan G Rennison
a2eac188de
Merge branches 'save_ext', 'tracerestrict-sx', 'departure-boards-sx', 'town_cargo_adj-sx', 'signal_tunnels_bridges-sx', 'adjacent_crossings-sx' and 'progsig-sx' into jgrpp
2015-08-03 00:39:01 +01:00
Jonathan G Rennison
bc8b2d9826
Merge branch 'save_ext' into tracerestrict-sx
2015-08-03 00:14:51 +01:00
Jonathan G Rennison
77ec2aac58
Merge branch 'save_ext' into progsig-sx
2015-08-03 00:14:12 +01:00
Jonathan G Rennison
6ac6759b00
Merge branch 'save_ext' into signal_tunnels_bridges-sx
2015-08-03 00:11:54 +01:00
Jonathan G Rennison
27c70542da
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
src/signal.cpp
2015-08-02 18:45:32 +01:00
Jonathan G Rennison
2bcbeea011
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
src/command_type.h
src/lang/english.txt
src/rail_cmd.cpp
src/rail_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/widgets/rail_widget.h
src/window_type.h
2015-08-02 18:15:18 +01:00
Jonathan G Rennison
9f79c555da
Merge branch 'save_ext' into signal_tunnels_bridges-sx
2015-08-01 20:27:19 +01:00
Jonathan G Rennison
22a5c6d459
Minor fixes in CmdRemoveSingleSignal
...
Whitespace fixes
2015-08-01 20:26:41 +01:00
patch-import
59b0b18aa2
Import signals on tunnels and bridges patch
...
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
2015-08-01 20:25:59 +01:00
patch-import
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
2015-08-01 17:06:43 +01:00
frosch
4eb6ce863a
(svn r27354) -Fix (r27343): Actually make it work. (rubidium)
2015-07-31 21:43:40 +00:00
frosch
e9b25f2ee8
(svn r27354) -Fix (r27343): Actually make it work. (rubidium)
2015-07-31 21:43:40 +00:00
Jonathan G Rennison
9fc308b70e
Update land info window to indicate if signal tile is restricted.
2015-07-28 21:43:23 +01:00
Jonathan G Rennison
5f1b148cf9
Initial minimal working tracerestrict implementation.
...
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
2015-07-28 01:36:52 +01:00
frosch
13a726b18f
(svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side.
2015-07-26 12:28:34 +00:00
frosch
74e61a1806
(svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side.
2015-07-26 12:28:34 +00:00
frosch
0efffb6df4
(svn r27309) -Change [FS#6283]: Auto-complete partial roads when building level-crossings. (adf88)
2015-06-20 13:15:35 +00:00
frosch
9b534b4393
(svn r27309) -Change [FS#6283]: Auto-complete partial roads when building level-crossings. (adf88)
2015-06-20 13:15:35 +00:00
frosch
db7dc5a6e9
(svn r27253) -Fix [FS#6282]: When crossing tram tracks with railroads, cost of extra roads was not being counted. (adf88)
2015-04-26 10:26:07 +00:00
frosch
e3c8e8e8e8
(svn r27253) -Fix [FS#6282]: When crossing tram tracks with railroads, cost of extra roads was not being counted. (adf88)
2015-04-26 10:26:07 +00:00
frosch
f690713802
(svn r27252) -Fix [FS#6281]: Invalid infrastructure counting when crossing tram tracks with railroads. (adf88)
2015-04-26 10:23:55 +00:00
frosch
3a82bae0d3
(svn r27252) -Fix [FS#6281]: Invalid infrastructure counting when crossing tram tracks with railroads. (adf88)
2015-04-26 10:23:55 +00:00
frosch
1ab66855db
(svn r27207) -Codechange: Replace some magic integers with the appropiate symbols.
2015-03-28 14:00:39 +00:00
frosch
a6e4e5d444
(svn r27207) -Codechange: Replace some magic integers with the appropiate symbols.
2015-03-28 14:00:39 +00:00
