dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,255 Commits 1 Branch 0 Tags
816d4eb657816e63a3b63100c315542e16d54465
Commit Graph

37 Commits

Author SHA1 Message Date
Jonathan G Rennison
3050620189 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/autoreplace_cmd.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.cpp
#	src/economy.cpp
#	src/engine_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/newgrf.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_func.h
#	src/order_gui.cpp
#	src/pathfinder/pathfinder_type.h
#	src/saveload/afterload.cpp
#	src/subsidy_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
 2024-01-11 17:55:16 +00:00
Jonathan G Rennison
1914c11459 Debug: Use zoning dropdown for debug zoning modes 
Control visibility using misc_debug 2, instead of controlling
debug modes themselves using misc_debug
 2024-01-10 18:28:43 +00:00
Jonathan G Rennison
985bd99c44 Debug: Add debug zoning overlays for water regions 2024-01-10 01:14:15 +00:00
Jonathan G Rennison
97e6f3062e Adding of _t to (u)int types, and WChar to char32_t 
See: eaae0bb5e
 2024-01-07 17:20:41 +00:00
Jonathan G Rennison
ead18b2af2 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
 2023-07-02 12:02:36 +01:00
Jonathan G Rennison
58d841486e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/os/windows/font_win32.cpp
#	src/script/api/script_object.hpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2022-12-27 01:00:40 +00:00
Jonathan G Rennison
541294e845 Debug: Add misc debug bit for animated tile zoning overlay 2022-05-31 01:32:48 +01:00
Jonathan G Rennison
8babbb5fe3 Debug: Add misc debug bit for tropic mode zoning overlay 2022-03-17 17:33:37 +00:00
Jonathan G Rennison
c59d78db11 Zoning: Fix restricted signal zoning mode with tunnels/bridges 2022-03-17 17:33:09 +00:00
Jonathan G Rennison
afa75ded1c Zoning: Fix unserved industry mode with passenger-handling industries 2022-01-24 18:30:18 +00:00
Jonathan G Rennison
e56fee612c Zoning: Fix unserved industries mode with partially overlapping catchment 2022-01-24 00:39:24 +00:00
Jonathan G Rennison
7015c92680 Check station coverage highlight in ZoningMarkDirtyStationCoverageArea 2022-01-20 01:16:16 +00:00
Jonathan G Rennison
74bfe4e6d2 Allow placing routing restrictions on tunnel/bridge entrance/exit signals 
No reserve through support
 2021-11-13 22:28:14 +00:00
Jonathan G Rennison
0422e2fe1e Add misc debug flag for water flooding states 2021-04-12 23:59:21 +01:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
 2021-02-01 17:07:34 +00:00
Jonathan G Rennison
ffe3c769a3 Add road tile cached one way state, one way road section detection 2020-10-28 00:27:48 +00:00
Jonathan G Rennison
38a153017f One-way road zoning mode 2020-10-28 00:27:48 +00:00
Jonathan G Rennison
a474e71243 Viewport: Cache landscape pixels in map mode 
Avoid invalidating landscape pixels for non-landscape updates
(vehicles, overlays, etc.)
 2020-10-01 23:18:39 +01:00
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