You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/bin
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
9 years ago
..
ai (svn r27192) -Change: heading for 1.6 now 9 years ago
baseset (svn r27266) -Fix (r27265): Eddi jinxed it. 9 years ago
data Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch 9 years ago
game (svn r27192) -Change: heading for 1.6 now 9 years ago
scripts (svn r15302) -Add: example file for on_server_connect.scr and document it in the scripts readme 16 years ago