dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,141 Commits 1 Branch 0 Tags
35ebeff8742201bba0cf4bf003b4d87755dc25e5
Commit Graph

826 Commits

Author SHA1 Message Date
Jonathan G Rennison
8cc6bddc24 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 
Conflicts:
	src/misc.cpp
 2015-11-11 19:20:36 +00:00
Jonathan G Rennison
919057a5e6 Cache tunnel info in viewport map mode, to prevent render flicker. 
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
 2015-11-11 19:18:32 +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
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
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
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
frosch
90d50d78c0 (svn r27313) -Fix [FS#6317]: Adding tram to town-owned bridges assigned an incorrect owner to the tram and did not count infrastructure counts properly. (marcole) 2015-06-21 09:52:30 +00:00
frosch
55e53780cb (svn r27313) -Fix [FS#6317]: Adding tram to town-owned bridges assigned an incorrect owner to the tram and did not count infrastructure counts properly. (marcole) 2015-06-21 09:52:30 +00:00
frosch
bba85a6e01 (svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads. 2015-03-28 14:04:06 +00:00
frosch
beb213f9ee (svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads. 2015-03-28 14:04:06 +00:00
frosch
5503af7bfa (svn r27208) -Fix: Draw correct overlay sprites for path reservations on bridges and tunnels. 2015-03-28 14:03:26 +00:00
frosch
8f03a02efc (svn r27208) -Fix: Draw correct overlay sprites for path reservations on bridges and tunnels. 2015-03-28 14:03:26 +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
frosch
e8e49e5dda (svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. 2015-02-22 14:01:24 +00:00
rubidium
647a3c8e5f (svn r26882) -Feature: allow limiting the height of bridges (ic111) 2014-09-21 11:40:11 +00:00
rubidium
ce04c49e3d (svn r26882) -Feature: allow limiting the height of bridges (ic111) 2014-09-21 11:40:11 +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
9daf7e749c (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
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 2014-04-23 20:13:33 +00:00
frosch
2ce5034005 (svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window. 2014-01-26 13:50:10 +00:00
frosch
f0e7f9982a (svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window. 2014-01-26 13:50:10 +00:00
rubidium
baad79b1b6 (svn r26111) -Fix: theoretical case where sprite table could be overread for aqueducts that start at flat land 2013-11-25 16:26:50 +00:00
rubidium
b53da6a6f5 (svn r26111) -Fix: theoretical case where sprite table could be overread for aqueducts that start at flat land 2013-11-25 16:26:50 +00:00
rubidium
157a3d3be4 (svn r26072) -Cleanup: mark some unreachable default cases by NOT_REACHED() 2013-11-23 18:13:30 +00:00
rubidium
be6b64f4e6 (svn r26072) -Cleanup: mark some unreachable default cases by NOT_REACHED() 2013-11-23 18:13:30 +00:00
frosch
0ca316e1d9 (svn r25231) -Fix (r25227): Also update infrastructure counts. (adf88) 2013-05-07 13:49:18 +00:00
frosch
1e41b38b7d (svn r25231) -Fix (r25227): Also update infrastructure counts. (adf88) 2013-05-07 13:49:18 +00:00
frosch
dd7d470808 (svn r25227) -Fix [FS#5541]: Give bridges owned by noone (from bankrupt companies) to the first company which replaces the bridge. Everyone could have removed/rebuild the bridge anyway. 2013-05-06 15:41:34 +00:00
frosch
d3b9a55535 (svn r25227) -Fix [FS#5541]: Give bridges owned by noone (from bankrupt companies) to the first company which replaces the bridge. Everyone could have removed/rebuild the bridge anyway. 2013-05-06 15:41:34 +00:00
frosch
4c4010970a (svn r25141) -Fix: When extra dynamite was disabled, towns would be allowed to clear bridges with trams. 2013-04-03 20:25:06 +00:00
frosch
1e9049e0bd (svn r25141) -Fix: When extra dynamite was disabled, towns would be allowed to clear bridges with trams. 2013-04-03 20:25:06 +00:00
frosch
5bf6513dfc (svn r24912) -Fix [FS#5389]: Upgrading bridges could steal road types. (adf88) 2013-01-13 13:17:12 +00:00
frosch
eda4cfeabe (svn r24912) -Fix [FS#5389]: Upgrading bridges could steal road types. (adf88) 2013-01-13 13:17:12 +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
planetmaker
c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
planetmaker
92a2302dbd (svn r24895) -Fix [FS#5436]: Allow downgrade of road bridges in the scenario editor 2013-01-08 17:56:43 +00:00
planetmaker
812346cad9 (svn r24895) -Fix [FS#5436]: Allow downgrade of road bridges in the scenario editor 2013-01-08 17:56:43 +00:00
frosch
1e327a20c4 (svn r24413) -Add [FS#5221-ish]: Allow overbuilding bridges with the same type when adding a roadtype. 2012-07-18 19:24:13 +00:00
frosch
25203976f0 (svn r24413) -Add [FS#5221-ish]: Allow overbuilding bridges with the same type when adding a roadtype. 2012-07-18 19:24:13 +00:00
rubidium
76d5833650 (svn r24179) -Codechange: move some variables of Town to TownCache 2012-04-25 20:50:13 +00:00
rubidium
41e5c839e0 (svn r24179) -Codechange: move some variables of Town to TownCache 2012-04-25 20:50:13 +00:00
michi_cc
ff73fdb4b0 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 2012-02-15 21:23:48 +00:00
michi_cc
9101d2e2d2 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 2012-02-15 21:23:48 +00:00
frosch
4705dc84b1 (svn r23864) -Fix: Railtype overlays were drawn 'only transparent' on invisible bridges. 2012-01-28 18:11:18 +00:00
frosch
1eac425e0b (svn r23864) -Fix: Railtype overlays were drawn 'only transparent' on invisible bridges. 2012-01-28 18:11:18 +00:00