Commit Graph

19 Commits

Author SHA1 Message Date
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
91ca46c774 Fix -Wdeprecated-copy and -Wclass-memaccess warnings on GCC 9 2019-11-05 18:08:02 +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
5e6d283463 Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
2019-03-13 03:38:26 +00: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
79f1c2b97b Zoning: Fix off-by-one in zoning cache rect invalidation (SW edge) 2018-09-26 01:32:32 +01:00
Jonathan G Rennison
793a446062 Zoning: Ensure that screen is refreshed when necessary in authority overlay 2018-05-11 00:03:49 +01:00
Jonathan G Rennison
f373a67610 Fix display of zoning overlay sprites on half-tile foundations
Partly based on commit 598b781259a5c1ad25cf3de85807b9c79e9f08fe
2018-05-10 23:10:04 +01:00
Jonathan G Rennison
cb2077edd5 Zoning: Fix unserved building/industry highlight not being removed when tile cleared 2018-03-11 22:07:33 +00:00
Jonathan G Rennison
38fb8c1b84 Zoning: Cache expensive zoning overlay values 2018-01-22 17:49:53 +00:00
Jonathan G Rennison
37a58fd11d Add setting to increase station catchment radius.
Update acceptance and refresh screen when catchment settings change.
2016-11-20 01:49:10 +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
196b78af30 Merge branch 'zoning' into jgrpp 2015-11-01 16:08:06 +00:00
Jonathan G Rennison
c120b810d1 Mark dirty the catchment of a station on change as necessary for zoning.
If the zoning mode is station catchment, or unserved industry/building,
mark dirty the station catchment rectangle before removing, or after
adding, (a) station tile(s).
In the case of unserved industry mode, increase the refreshed catchment
radius by 10 tiles, to wholly include industries partially inside
the catchment area.
2015-11-01 16:07:55 +00:00
Jonathan G Rennison
34ce418b63 Zoning: Add mode to show restricted signals. 2015-10-15 00:23:46 +01:00
Jonathan G Rennison
74bccb5d50 Zoning: Implement ownership checks, and station facility checks for industries. 2015-08-02 13:17:43 +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