Commit Graph

5 Commits (5199e19213bfad4c9cd145b2b606cc6ad4015244)

Author SHA1 Message Date
Jonathan G Rennison b9091a0f6c Merge branch 'zoning' into jgrpp
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
9 years ago
Jonathan G Rennison 7f84a1c501 Zoning: Add mode to show station catchment only where station window open. 9 years ago
Jonathan G Rennison 34ce418b63 Zoning: Add mode to show restricted signals. 9 years ago
Jonathan G Rennison 03373c7ef4 Zoning: Remove unimplemented modes, fix some whitespace and style issues,
add missing licence headers, move/rename some declarations, fix sprite
ID allocation, update to build on trunk.
9 years ago
patch-import 6de087786c Import and rebase zoning patch
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
9 years ago