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
patch-import
4117808b9d
Import adjacent crossings patch (v3.1)
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=836749#p836749
2015-08-02 17:12:15 +01:00
frosch
d4db9cb109
(svn r27312) -Fix-ish [FS#6317]: Preserve town ownership of bridges when removing road from a road+tram bridge. (marcole)
2015-06-21 09:31:50 +00:00
frosch
c0015d6a7c
(svn r27311) -Fix: Mark infrastructure window dirty in more cases. (marcole)
2015-06-21 09:19:27 +00:00
frosch
07b83b8869
(svn r27308) -Fix [FS#6283]: Prevent breaking of tram-reversal points by adding more road pieces. (adf88)
2015-06-20 13:11:09 +00:00
michi_cc
ab048fdcd1
(svn r27186) -Codechange: Rename AlwaysDrawUnpavedRoads() to better reflect what it does.
2015-03-14 14:27:07 +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
rubidium
67991b70f0
(svn r26955) -Fix [FS#6126]: owner of road depot road types were not properly changed upon bankruptcy causing crashes when trying to remove the depot in certain situations
2014-10-04 19:23:43 +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
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
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
2012-12-23 21:09:09 +00:00
terkhen
98e49d3648
(svn r24626) -Fix [FS#5432]: MSVC 2010 warnings.
2012-10-25 17:38:12 +00:00
terkhen
138e3f7050
(svn r24503) -Change [FS#5228]: When building long roads or tramways, only build the roadbits at the beginning and the end if they can connect to something.
2012-09-01 14:58:36 +00:00
frosch
7e254c6982
(svn r24414) -Fix [FS#5221]: Disallow removing roadtypes from bridges when not dragging in bridge direction.
2012-07-18 19:25:00 +00:00
rubidium
76d5833650
(svn r24179) -Codechange: move some variables of Town to TownCache
2012-04-25 20:50:13 +00:00
rubidium
11ad0be0ee
(svn r23847) -Fix: when removing road or tram from a tram+road stop, the owner of the road stop's cache was updated instead of the owner of the removed infrastructure
2012-01-24 19:24:02 +00:00
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
2012-01-03 21:32:51 +00:00
rubidium
22a5dbc0bb
(svn r23684) -Cleanup: let the highway take the highway
2011-12-28 20:06:51 +00:00
truebrain
102c7ae60e
(svn r23629) -Add: allow ScriptRoad::BuildRoad, ScriptBridge::BuildBridge (for roads) and ScriptTunnel:BuildTunnel (for roads) to work for GameScript
2011-12-19 21:02:33 +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
yexo
36e61e08b3
(svn r23160) -Fix: wrong comments in a lot of TileTypeProcs definitions
2011-11-08 17:37:32 +00:00
rubidium
0e2d2b2317
(svn r23108) -Codechange: more uint -> int / byte -> int conversions for Z related variables
2011-11-04 11:52:19 +00:00
rubidium
fb9fb416a1
(svn r23107) -Codechange: let GetSlopePixelZ and TerraformTile tile type functions use int z as well
2011-11-04 11:36:10 +00:00
rubidium
70faeeaba9
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
2011-11-04 11:30:37 +00:00
rubidium
5d7acba5d3
(svn r23100) -Codechange: remove pointless multiplications by TILE_HEIGHT for the terraform code
2011-11-04 10:30:10 +00:00
rubidium
fd992c9fd8
(svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code
2011-11-04 10:28:20 +00:00
rubidium
a70fdbcf2f
(svn r23096) -Codechange: remove useless divisions and multiplications by TILE_HEIGHT for the snow line code
2011-11-04 10:25:58 +00:00
rubidium
f7297d5c3a
(svn r23094) -Codechange: add a default NULL to GetFoundationSlope and use it
2011-11-04 10:23:48 +00:00
rubidium
bcb93b3b75
(svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it
2011-11-04 10:22:27 +00:00
rubidium
de980ef0f9
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
2011-11-04 10:18:13 +00:00
frosch
a1c155e0f9
(svn r22968) -Feature: Allow road corners on steep slopes.
2011-10-01 16:45:25 +00:00
frosch
1df095f114
(svn r22960) -Feature: Allow depots, standard roadstops and airports on steep slopes.
2011-09-25 13:35:17 +00:00
planetmaker
9a8285b0f5
(svn r22765) -Cleanup: Remove unused constants and name a magic constant
2011-08-20 05:35:03 +00:00
rubidium
a4379b814d
(svn r22699) -Fix [FS#4681]: Cost of adding an extra road type to a bridge or tunnel was undercalculated (adf88)
2011-07-30 13:55:44 +00:00
frosch
a2dcfce59d
(svn r22516) -Codechange: Replace some magic numbers with the appropiate enum values. (Eddi)
2011-05-29 08:56:05 +00:00
alberth
a70556dac2
(svn r22459) -Doc: Typo fixes and doxygen markup improvements.
2011-05-14 18:35:40 +00:00
rubidium
6e9122828e
(svn r22406) -Document: some more "random-ish" tidbits
2011-05-01 19:51:52 +00:00
planetmaker
6d031d0867
(svn r22080) -Doc: Add doxygen comments to a few functions and improve a few existing comments
2011-02-14 19:52:26 +00:00
rubidium
cb2c7f871f
(svn r22018) -Cleanup: remove some (now) unneeded includes of functions.h
2011-02-07 22:37:22 +00:00
rubidium
dd39a0395c
(svn r21765) -Fix [FS#4369]: PBS reservation was not shown on road crossings with NewGRF railtypes (andythenorth)
2011-01-09 20:54:56 +00:00
yexo
f85bd1f37f
(svn r20728) -Codechange: shuffle some code in CMD_BUILD_ROAD so it doesn't call CMD_LANDSCAPE_CLEAR in test-mode from exec-mode
2010-09-03 21:41:08 +00:00
rubidium
360d6daf34
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
2010-08-26 22:01:16 +00:00
frosch
5b86c79fce
(svn r20283) -Codechange: Unify start of doygen comments.
2010-08-01 19:22:34 +00:00
rubidium
8c85b4ce3d
(svn r20281) -Codechange: unify case scope closure + break coding style
2010-08-01 18:53:30 +00:00
