Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
57,930 Commits
12 Branches
173 Tags
426 MiB
jgrpp
tmp-jgrpp
master
mapgen-water-desert-removal-circular
wip-string-2
wip-string
diagonal_road_investigations
sse-blitter-set-alpha
desync-debugging
save_ext
tracerestrict
tracerestrict-sx
jgrpp-0.1
jgrpp-0.1.1
jgrpp-0.1.2
jgrpp-0.10.0
jgrpp-0.10.1
jgrpp-0.10.2
jgrpp-0.11.0
jgrpp-0.12.0
jgrpp-0.12.1
jgrpp-0.13.0
jgrpp-0.13.1
jgrpp-0.13.2
jgrpp-0.13.3
jgrpp-0.14.0
jgrpp-0.15.0
jgrpp-0.15.1
jgrpp-0.16.0
jgrpp-0.16.1
jgrpp-0.17.0
jgrpp-0.17.1
jgrpp-0.17.2
jgrpp-0.18.0
jgrpp-0.19.0
jgrpp-0.2.0
jgrpp-0.2.1
jgrpp-0.20.0
jgrpp-0.20.1
jgrpp-0.21.0
jgrpp-0.22.0
jgrpp-0.22.1
jgrpp-0.22.2
jgrpp-0.23.0
jgrpp-0.24.0
jgrpp-0.24.1
jgrpp-0.25.0
jgrpp-0.25.1
jgrpp-0.25.2
jgrpp-0.26.0
jgrpp-0.26.1
jgrpp-0.26.2
jgrpp-0.27.0
jgrpp-0.27.1
jgrpp-0.28.0
jgrpp-0.29.0
jgrpp-0.29.1
jgrpp-0.29.2
jgrpp-0.29.3
jgrpp-0.3.0
jgrpp-0.3.1
jgrpp-0.3.2
jgrpp-0.30.0
jgrpp-0.30.1
jgrpp-0.30.2
jgrpp-0.30.3
jgrpp-0.31.0
jgrpp-0.31.1
jgrpp-0.31.2
jgrpp-0.31.3
jgrpp-0.31.4
jgrpp-0.31.5
jgrpp-0.32-rc1
jgrpp-0.32-rc2
jgrpp-0.32-rc3
jgrpp-0.32-rc4
jgrpp-0.32-rc5
jgrpp-0.32.0
jgrpp-0.32.1
jgrpp-0.32.2
jgrpp-0.32.3
jgrpp-0.32.4
jgrpp-0.33.0
jgrpp-0.33.1
jgrpp-0.33.2
jgrpp-0.34-rc1
jgrpp-0.34.0
jgrpp-0.34.1
jgrpp-0.34.2
jgrpp-0.34.3
jgrpp-0.34.4
jgrpp-0.35.0
jgrpp-0.35.1
jgrpp-0.36.0
jgrpp-0.37.0
jgrpp-0.38.0
jgrpp-0.38.1
jgrpp-0.39.0
jgrpp-0.39.1
jgrpp-0.39.2
jgrpp-0.4.0
jgrpp-0.4.1
jgrpp-0.40.0
jgrpp-0.40.1
jgrpp-0.40.2
jgrpp-0.40.3
jgrpp-0.40.4
jgrpp-0.40.5
jgrpp-0.41.0
jgrpp-0.41.1
jgrpp-0.41.2
jgrpp-0.41.3
jgrpp-0.42.0
jgrpp-0.42.1
jgrpp-0.42.2
jgrpp-0.42.3
jgrpp-0.43.0
jgrpp-0.43.1
jgrpp-0.43.2
jgrpp-0.44-rc1
jgrpp-0.44.0
jgrpp-0.44.1
jgrpp-0.44.2
jgrpp-0.45.0
jgrpp-0.45.1
jgrpp-0.46-rc1
jgrpp-0.46-rc2
jgrpp-0.46.0
jgrpp-0.46.1
jgrpp-0.47.0
jgrpp-0.47.1
jgrpp-0.47.2
jgrpp-0.47.3
jgrpp-0.48.0
jgrpp-0.48.1
jgrpp-0.48.2
jgrpp-0.48.3
jgrpp-0.48.4
jgrpp-0.48.5
jgrpp-0.49.0
jgrpp-0.49.1
jgrpp-0.49.2
jgrpp-0.5.0
jgrpp-0.5.1
jgrpp-0.5.2
jgrpp-0.5.3
jgrpp-0.50.0
jgrpp-0.50.1
jgrpp-0.50.2
jgrpp-0.50.3
jgrpp-0.51.0
jgrpp-0.51.1
jgrpp-0.52.0
jgrpp-0.52.1
jgrpp-0.53.0
jgrpp-0.53.1
jgrpp-0.53.2
jgrpp-0.53.3
jgrpp-0.54.0
jgrpp-0.54.1
jgrpp-0.54.2
jgrpp-0.54.3
jgrpp-0.54.4
jgrpp-0.54.5
jgrpp-0.55.0
jgrpp-0.55.1
jgrpp-0.55.2
jgrpp-0.55.3
jgrpp-0.56.0
jgrpp-0.56.1
jgrpp-0.56.2
jgrpp-0.57.0
jgrpp-0.57.1
jgrpp-0.58.0
jgrpp-0.58.1
jgrpp-0.58.2
jgrpp-0.58.3
jgrpp-0.59.0
jgrpp-0.59.1
jgrpp-0.6.0
jgrpp-0.7.0
jgrpp-0.7.1
jgrpp-0.8.0
jgrpp-0.8.1
jgrpp-0.9.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '98f1fb2722'
${ noResults }
Commit Graph

897 Commits (98f1fb272207b2df595ec9c5277ead0971b883ef)

Author SHA1 Message Date
Jonathan G Rennison d5ada6a14b Add setting to control RV re-routing on road layout change 
Default to road removal only
This is due to poor performance with many RVs when town growth is
continually adding to the road layout
 4 years ago
Jonathan G Rennison 3adeff1883 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	cmake/CompileFlags.cmake
#	src/bridge_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/town_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/toolbar_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
 4 years ago
ilayaraja97 cf8ccf4b08 Fix #8131: small bridges also have pillars drawn 4 years ago
Jonathan G Rennison ea06a0670d Add rail ground type support for rail custom bridge heads 
See: #146
 4 years ago
Jonathan G Rennison a94a8da990 Suppress warning about using operator ^ on bool 4 years ago
Jonathan G Rennison 7949de2c05 Add a minimum visible height and no ground tile parameter to DrawTileProc. 
Filter out tile parts which are entirely outside the drawing area.
 4 years ago
Jonathan G Rennison 8956b1ab02 Improve performance of tunnel rendering in viewport map mode 4 years ago
Jonathan G Rennison 99e0229860 Merge branch 'master' into jgrpp 4 years ago
Niels Martin Hansen 45838d0105 Fix #7958: Use NewGRF provided catenary sprites when either front or back is overridden 4 years ago
Niels Martin Hansen 9e4eee1b9e Codechange: Refactor road bridge catenary drawing 4 years ago
Jonathan G Rennison 76f68c48f5 Cache whether vehicle is currently drawn: Vehicle::IsDrawn() 4 years ago
Jonathan G Rennison 7960db35f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 5 years ago
Charles Pigott ab9042145e Fix #6667: Also recalculate bridge costs for 'spectated' AI companies 5 years ago
Jonathan G Rennison 2b0c1a5930 Separate allow stations under bridges into settings for: rail, road, docks 5 years ago
Jonathan G Rennison acc946f505 Always allow buoys under bridges 5 years ago
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
 5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison edfd378e93 Merge branch 'master' into jgrpp 
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
 5 years ago
JMcKiern 04f659e768 Fix: Some typos found using codespell 5 years ago
Jonathan G Rennison 8a01fba216 Fix crash in GetTileDesc_TunnelBridge on non-road bridges 5 years ago
Jonathan G Rennison d3e0c3787f Merge branch 'master' into jgrpp-nrt 
Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
 5 years ago
Jonathan G Rennison 7555cf2965 Fix road vehicles being unable to enter bridge at custom bridge head 
Type mismatch
 5 years ago
Jonathan G Rennison ba8ed880c1 Merge branch 'master' into jgrpp-nrt 
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 5 years ago
peter1138 f538179878 Feature: Multi-tile docks and docking points. 5 years ago
Jonathan G Rennison 829c635add Add road layout change counter, add to road veh path caches 
Update layout counter when non-leaf road bits are added or removed
 5 years ago
peter1138 c02ef3e456 Feature: Add NotRoadTypes (NRT) 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison ba34ec7ade Merge branch 'master' into jgrpp 
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
 5 years ago
Henry Wilson ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 5 years ago
Henry Wilson a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 5 years ago
Jonathan G Rennison e15601e12f Cache whether a train may have a depot or bridge speed restriction 6 years ago
Jonathan G Rennison 0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
 6 years ago
Niels Martin Hansen b8b6954fb5 Fix 6a3d411: Silence truncation warning 6 years ago
Jonathan G Rennison 70020e1a5c Fix incorrect accounting of rail tunnel/bridge infrastructure counts 
Regression from dual rail types change
 6 years ago
Jonathan G Rennison 65b9a103ad Initial implementation of two rail types per tile 6 years ago
Jonathan G Rennison df0aa2ed4b Add pillar and station height checks to bridge upgrade command 6 years ago
Jonathan G Rennison 8b37e5aac2 Implement custom bridge pillar flag support 
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars

Set values for default bridges and stations
 6 years ago
Jonathan G Rennison 6df12e77b6 Refactor/de-duplicate rail station bridge above check methods 6 years ago
Jonathan G Rennison beaddc8a98 Set minimum bridge height clearances for default stations 6 years ago
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
 6 years ago
Charles Pigott 1778b2d66e Codechange: Merge some duplicated functions 6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison ef0a0b0f8e Implement rail station property 1B, bridge clearance information 6 years ago
Jonathan G Rennison b9d7f8e0a7 Disallow building bridges over airports 6 years ago
Jonathan G Rennison ae15c96c1a Merge branch 'master' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 6 years ago
Peter Nelson bf8d7df736 Change: Extend rail types to 64 (6 bit storage) 6 years ago
Jonathan G Rennison 035f5622b9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
 6 years ago
Jonathan G Rennison 4bdbf3863d Add setting to allow placing stations under bridges 6 years ago
Jonathan G Rennison 56bde8ce18 Add setting to allow placing all NewGRF objects under bridges 6 years ago
Jonathan G Rennison 6a3d411fa1 Fix: Use after free in CmdBuildTunnel (#6856) 
Use after free could occur when when excavating far end
removed multiple NewGRF objects
 6 years ago
Jonathan G Rennison 42505f3532 Merge branch 'custom_bridgeheads' into jgrpp 6 years ago
Jonathan G Rennison 176fd2180b Fix regression preventing road vehicles from leaving tunnels 6 years ago
Jonathan G Rennison 6740a9a470 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
 6 years ago
Jonathan G Rennison 77362b829a Initial support for rail custom bridge heads 6 years ago
Jonathan G Rennison 79ca5c8b7d Merge branch 'custom_bridgeheads' into jgrpp 6 years ago
Jonathan G Rennison 25af12814b Fix double-adding of road tunnel/bridge infra counts when changing owner 6 years ago
Jonathan G Rennison 670ed0de5b Fix double-accounting of bidi signals on bridge/tunnel during owner change 6 years ago
Jonathan G Rennison e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h
 6 years ago
Jonathan G Rennison 814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 6 years ago
Jonathan G Rennison d03139b241 Use separate bits for signals on bridge/tunnel entrance/exit red/green states 6 years ago
Jonathan G Rennison b7ce21038a Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/tunnelbridge_cmd.cpp
 6 years ago
Jonathan G Rennison 1911c0cb69 Fix handling of custom bridge head ramp-only pieces/types when upgrading 6 years ago
Jonathan G Rennison c053549144 Merge branch 'signal_tunnels_bridges' into jgrpp 6 years ago
Jonathan G Rennison c92a28a072 Preserve signal simulation/reservation data when upgrading bridges. 
Based on commit 301925f948c9b36966c9c668e1476c2485425338
 6 years ago
Jonathan G Rennison 714b9711e4 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/tunnelbridge_cmd.cpp
 6 years ago
Jonathan G Rennison ff6a3ed234 Preserve custom bridge head road data when upgrading bridges. 
Based on commit 301925f948c9b36966c9c668e1476c2485425338
 6 years ago
Jonathan G Rennison e138d3564b Fix tram reversing on custom bridge head tiles. 
(cherry picked from commit 0a345efc27)
 6 years ago
Jonathan G Rennison 102c55bc57 Fix assertion failure when trams do a short turnaround in a tunnel mouth 7 years ago
Jonathan G Rennison 0a345efc27 Fix tram reversing on custom bridge head tiles. 7 years ago
Jonathan G Rennison 95e8bc67cc Merge branch 'chunnel' into jgrpp 7 years ago
HackaLittleBit 60345d2e18 Fix cost of building tunnels. 7 years ago
Jonathan G Rennison 4d21d6f81c Merge branch 'chunnel' into jgrpp 7 years ago
HackaLittleBit eddd635f00 Chunnel: Make error reporting consistent with tunnel length reporting at cursor. 
Error reporting should be in tune with occurrence of events.
 7 years ago
Jonathan G Rennison 612c825bb6 Chunnel: Minor whitespace/scope changes, rename function. 7 years ago
HackaLittleBit 2549def764 Chunnel: Use separate container function for chunnel related conditions. 7 years ago
Jonathan G Rennison 0d4bf16f57 Merge branch 'custom_bridgeheads' into jgrpp 7 years ago
Jonathan G Rennison 57a5f08687 Fix handling of custom bridge heads on steep slopes. 7 years ago
HackaLittleBit de24fed9d1 Chunnel: Tunnels are only allowed to cross sea. 7 years ago
Jonathan G Rennison 93a43da809 Chunnel: Prevent chunnels from intersecting with each other. 7 years ago
Jonathan G Rennison 4c9f7b73b3 Chunnel: Add a ground veh flag for (maybe) being in a chunnel 
Use this to avoid inclination change code in non-chunnel wormholes.
 7 years ago
Jonathan G Rennison 500ef49694 Chunnel: Double cost of building and removing chunnels. 7 years ago
Jonathan G Rennison 89a0a9c182 Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format. 7 years ago
Jonathan G Rennison 212f6ce6ef Chunnel: Add setting to enable construction, default off. 7 years ago
Jonathan G Rennison 02b33e7f64 Chunnel: Add error text for too many tunnels. 7 years ago
Jonathan G Rennison aac5b2d4ad Chunnel: Adjust struct Tunnel constructor 7 years ago
Jonathan G Rennison 21bbb42d7e Chunnel: Adjust arguments of IsTunnelInWay 7 years ago
HackaLittleBit 7e6215f271 Chunnel patch 28401: Add: Tile description chunnel. 
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
 7 years ago
HackaLittleBit 15c8e67655 Chunnel patch 28400: Codechange: Chunnels can now pass normal tunnels, fixed tile highlighting, fixed ramp detection. 
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
 7 years ago
HackaLittleBit 1ac8f66de1 Chunnel patch 28397: Codechange: Chunnels can't pass oilrigs. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 7 years ago
HackaLittleBit dfce9cc4c0 Chunnel patch 28396: Codechange: Chunnel portal must have minimal length of 4 tiles. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 7 years ago
HackaLittleBit dee526c6d6 Chunnel patch 28395: Add: Basic chunnel. Creating tunnels under water. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 7 years ago
HackaLittleBit f7ced74c22 Chunnel patch 28394: Codechange: Rework IsTunnelInWay proc. 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 7 years ago
HackaLittleBit ad070b91ea Chunnel patch 28392: Add: Basic tunnel pool. (no save) 
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
 7 years ago
Jonathan G Rennison 091c30e254 Merge branch 'custom_bridgeheads' into jgrpp 7 years ago
Jonathan G Rennison c6fa52f1f1 Fix wrong calculation of road tunnel infrastructure counts. 7 years ago
Jonathan G Rennison 4550ac39b9 Merge branch 'signal_tunnels_bridges' into jgrpp 7 years ago
Jonathan G Rennison e1ee952b85 Fix crash when updating infrastructure totals when deleting bridge with signals. 7 years ago
Jonathan G Rennison 072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
 8 years ago
Jonathan G Rennison da177d063f Custom bridge heads: Initial implementation 8 years ago
Jonathan G Rennison 1e5c788541 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h
 8 years ago
Jonathan G Rennison d762835903 Signals on tunnel/bridges are now added to infrastructure stats. 8 years ago
Jonathan G Rennison 074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 8 years ago
Jonathan G Rennison 478ff2538e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
 8 years ago
frosch 10293c5fb1 (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 8 years ago
frosch 4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 8 years ago
Jonathan G Rennison 10ae23d3b9 Merge branch 'departure-boards' into jgrpp 
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
 8 years ago
frosch d9bfe88261 (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 8 years ago
frosch 616c02c42e (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 8 years ago
Jonathan G Rennison f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 8 years ago
Jonathan G Rennison 556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 8 years ago
Jonathan G Rennison 0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs. 
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
 8 years ago
Jonathan G Rennison d733955d33 Add road vehicle state to UpdateViewport()->GetImage() var whitelist. 
Minor refactoring of var check.
 8 years ago
keldorkatarn 4c37aad393 Make sure we the custom track type based signals for bridges and tunnels also. 
(cherry picked from commit 1dc478cb654f88eab3c760bdc9f305ce3f039ec3)
 8 years ago
keldorkatarn 5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array. 
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
 8 years ago
Jonathan G Rennison d08b162119 Merge branch 'signal_tunnels_bridges-sx' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
 8 years ago
Jonathan G Rennison 35b93a42ac Enable bridge/tunnel exit signals to be one-way PBS. 
Add signal conversion support.
 8 years ago
Jonathan G Rennison 1a2b5e5172 Also draw signals for tunnel exits. 8 years ago
Jonathan G Rennison 3861968765 Enable setting semaphore/electric type of signals on bridges/tunnels. 8 years ago
Jonathan G Rennison 2b4dbf582a Show tunnel/bridge exit signal facing correct way with correct colour. 8 years ago
Jonathan G Rennison a25ac7a161 Enable signals on bridges/tunnels to work with PBS. 8 years ago
Jonathan G Rennison 8cc6bddc24 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 
Conflicts:
	src/misc.cpp
 9 years ago
Jonathan G Rennison 919057a5e6 Cache tunnel info in viewport map mode, to prevent render flicker. 
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
 9 years ago
Jonathan G Rennison 169a979737 Merge branch 'signal_tunnels_bridges-sx' into jgrpp 
Conflicts:
	src/tunnelbridge.h

(Fixup zoom level changes).
 9 years ago
Jonathan G Rennison b3e03e8cf9 Fix middle of bridge not being redrawn when adding removing signals. 9 years ago
Jonathan G Rennison e07e4fdb8e Merge branch 'master' into signal_tunnels_bridges 9 years ago
Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
 9 years ago
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
Jonathan G Rennison 9f79c555da Merge branch 'save_ext' into signal_tunnels_bridges-sx 9 years ago
Jonathan G Rennison 22a5c6d459 Minor fixes in CmdRemoveSingleSignal 
Whitespace fixes
 9 years ago
patch-import 59b0b18aa2 Import signals on tunnels and bridges patch 
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
 9 years ago
frosch 90d50d78c0 (svn r27313) -Fix [FS#6317]: Adding tram to town-owned bridges assigned an incorrect owner to the tram and did not count infrastructure counts properly. (marcole) 9 years ago
frosch 55e53780cb (svn r27313) -Fix [FS#6317]: Adding tram to town-owned bridges assigned an incorrect owner to the tram and did not count infrastructure counts properly. (marcole) 9 years ago
frosch bba85a6e01 (svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads. 9 years ago
frosch beb213f9ee (svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads. 9 years ago
frosch 5503af7bfa (svn r27208) -Fix: Draw correct overlay sprites for path reservations on bridges and tunnels. 9 years ago
frosch 8f03a02efc (svn r27208) -Fix: Draw correct overlay sprites for path reservations on bridges and tunnels. 9 years ago
frosch bd3a8bf9e4 (svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. 9 years ago
frosch e8e49e5dda (svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. 9 years ago
rubidium 647a3c8e5f (svn r26882) -Feature: allow limiting the height of bridges (ic111) 10 years ago
rubidium ce04c49e3d (svn r26882) -Feature: allow limiting the height of bridges (ic111) 10 years ago
rubidium dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 10 years ago
rubidium 9daf7e749c (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 10 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
frosch 2ce5034005 (svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window. 11 years ago
frosch f0e7f9982a (svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window. 11 years ago
rubidium baad79b1b6 (svn r26111) -Fix: theoretical case where sprite table could be overread for aqueducts that start at flat land 11 years ago
rubidium b53da6a6f5 (svn r26111) -Fix: theoretical case where sprite table could be overread for aqueducts that start at flat land 11 years ago
rubidium 157a3d3be4 (svn r26072) -Cleanup: mark some unreachable default cases by NOT_REACHED() 11 years ago