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
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
0efffb6df4
(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
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
1ab66855db
(svn r27207) -Codechange: Replace some magic integers with the appropiate symbols.
2015-03-28 14:00:39 +00:00
frosch
bd3a8bf9e4
(svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges.
2015-02-22 14:01:24 +00:00
peter1138
4f63bbedc1
(svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level.
2014-09-22 08:01:25 +00:00
rubidium
dc2b4f2498
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
2014-09-21 11:24:51 +00:00
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
2014-04-23 20:13:33 +00:00
frosch
eb6974179d
(svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to.
2014-02-07 23:48:56 +00:00
fonsinchen
4b525e34fe
(svn r26291) -Fix [FS#5866, FS#5888]: Correctly identify opposite ends of bridges and tunnels when converting rails (adf88)
2014-02-02 14:54:13 +00:00
frosch
83b7021d9f
(svn r26279) -Fix [FS#5853]: [NoAI] Some RemoveRail methods required to set a valid railtype, though it was not used anyway. Remove the need to set one.
2014-01-26 14:54:34 +00:00
rubidium
34ae6d4b39
(svn r25972) -Fix [FS#5665]: rail laying sounds of others could be heard in multiplayer (adf88)
2013-11-12 21:48:55 +00:00
frosch
478500abbc
(svn r25832) -Codechange: Reduce variety of object type test functions.
2013-10-12 16:30:22 +00:00
frosch
0a11f93c3d
(svn r25302) -Fix [FS#5565]: Build railway fences next to objects, even if they are owned by the same company.
2013-05-29 17:13:53 +00:00
frosch
09ac5c639c
(svn r25082) -Codechange [FS#5501]: Simplify some code. (adf88)
2013-03-11 18:01:23 +00:00
rubidium
bad2326dad
(svn r25038) -Fix [FS#5479]: minimise gaps feature caused removal to only happen at the signal build interval instead of the implicit interval of 1
2013-02-23 18:29:55 +00:00
rubidium
4864344fc1
(svn r25037) -Fix [FS#5480]: green path signals would be shown when building them 'under' a train, and they would keep showing green until they were passed again
2013-02-23 18:15:54 +00:00
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
2013-01-08 22:46:42 +00:00
frosch
2fdf7b7f4e
(svn r24857) -Fix: Don't let UFOs and coal mines clear water.
2012-12-26 13:01:28 +00:00
frosch
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
2012-12-23 21:09:09 +00:00
frosch
d0ea1b96a9
(svn r24449) -Fix [FS#5254]: Coast and sea are not the same.
2012-07-30 19:38:17 +00:00
frosch
fae088737a
(svn r24439) -Fix [FS#5254]: In some cases ships could be covered with land.
2012-07-27 19:55:27 +00:00
michi_cc
bcac892dd7
(svn r24367) -Feature: [NewGRF] Customisable signals for rail types.
2012-07-01 23:12:50 +00:00
frosch
9c0aa44a41
(svn r24356) -Change: Allow building/modifying/removing signals even if a train is on the belonging track.
2012-06-23 20:18:29 +00:00
frosch
70b2c96c8b
(svn r24194) -Change: Rename the 'signal_side' setting to 'train_signal_side', and add a third option while doing so.
2012-05-01 15:53:51 +00:00
michi_cc
c67f4ddd9e
(svn r24143) -Change [FS#5145]: Improve fence placement for rail. (Eddi)
2012-04-17 19:44:51 +00:00
michi_cc
88cfe6fc9c
(svn r24129) -Feature [FS#3660]: Option to minimise signal distance when dragging over obstacles. (adf88)
2012-04-17 19:43:29 +00:00
michi_cc
617993e904
(svn r23773) -Change: [NewGRF] Update all cached train properties if a train vehicle enters a new railtype.
2012-01-08 12:47:54 +00:00
michi_cc
64b7bc557f
(svn r23758) -Feature: [NewGRF] Alternate rail type label list.
2012-01-05 19:40:34 +00:00
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
2012-01-03 21:32:51 +00:00
michi_cc
06ffcf0ae8
(svn r23593) -Fix (r23411): Infrastructure counts for rail were not properly updated when converting rail or building level crossings.
2011-12-19 14:24:12 +00:00
michi_cc
7a6b45c133
(svn r23412) -Add: Company infrastructure counts for road.
2011-12-03 23:40:18 +00:00
michi_cc
85ec2f07af
(svn r23411) -Add: Company infrastructure counts for rail.
2011-12-03 23:40:13 +00:00
