Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
2019-11-12 18:43:10 +00:00 |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Jonathan G Rennison
|
92a5e59165
|
Zoning: Add modes to show 2x2 and 3x3 town road grids
|
2018-10-06 13:01:01 +01:00 |
|
Jonathan G Rennison
|
38fb8c1b84
|
Zoning: Cache expensive zoning overlay values
|
2018-01-22 17:49:53 +00:00 |
|
Jonathan G Rennison
|
b9091a0f6c
|
Merge branch 'zoning' into jgrpp
Conflicts:
src/station_gui.cpp
src/zoning_cmd.cpp
|
2016-01-01 13:09:11 +00:00 |
|
Jonathan G Rennison
|
7f84a1c501
|
Zoning: Add mode to show station catchment only where station window open.
|
2016-01-01 12:17:11 +00:00 |
|
Jonathan G Rennison
|
34ce418b63
|
Zoning: Add mode to show restricted signals.
|
2015-10-15 00:23:46 +01:00 |
|
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.
|
2015-08-02 13:17:42 +01:00 |
|
patch-import
|
6de087786c
|
Import and rebase zoning patch
Fix some of the whitespace issues
http://www.tt-forums.net/viewtopic.php?p=888801#p888801
|
2015-08-02 13:17:42 +01:00 |
|