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
..
ai	(svn r27192) -Change: heading for 1.6 now	2015-03-17 20:33:44 +00:00
baseset	(svn r27266) -Fix (r27265): Eddi jinxed it.	2015-05-03 10:30:02 +00:00
data	Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch	2015-08-05 21:24:30 +01:00
game	(svn r27192) -Change: heading for 1.6 now	2015-03-17 20:33:44 +00:00
scripts	(svn r15302) -Add: example file for on_server_connect.scr and document it in the scripts readme	2009-01-31 23:50:53 +00:00