Commit Graph

187 Commits (da3b8dfb976f9fffd92afcf08700fa46ad859799)

Author SHA1 Message Date
Jonathan G Rennison 7bbd88caa2 Documentation: Update landscape docs with upstream features
Fix minor grammar issue
3 weeks ago
Jonathan G Rennison e42ac911ff Check for tracerestrict wait/wait at start in signal propagation
When using realistic braking, block/auto signals now don't default to
green on plain line where this would conflict with wait at PBS
or wait at start PBS tracerestrict actions.
3 weeks ago
Jonathan G Rennison 38b7c68623 Docs: Unmark road NewGRF road stops as patch feature in landscape docs 8 months ago
Peter Nelson b2a1ec96f1 Change: Store station blocked/wires/pylons flags in map.
This stores three flags in unused map bits, and avoids having to look up
station graphics and custom station specs to determine blocked/wires/pylons
status.

This potentially affects rail pathfinding performance.

Savegame version is not bumped, as the flags can just be updated every
time.

(cherry picked from commit cb658e6cc6e1c114c1eaafaaa5b14849f04ca083)
12 months ago
Jonathan G Rennison 12eb23f0ab Clear old tree counter in map array on load of old savegames
See: https://github.com/OpenTTD/OpenTTD/pull/10018
2 years ago
Jonathan G Rennison bdd73a19a1 Add signal style flag for unconditional reserve through
Add map bits for unconditional reserve through
Adjust signal aspect/state handling
2 years ago
Jonathan G Rennison 6e4c4b35e7 Initial implementation of NewGRF custom signal styles 2 years ago
Jonathan G Rennison 1084bb8566 Initial support for NewGRF road stops (bus and lorry stops) 3 years ago
Jonathan G Rennison 5fd2610f69 Documentation: Fix type/height columns in landscape grid 3 years ago
Jonathan G Rennison d4f11eca42 Add NewGRF object properties to set viewport map mode/smallmap tile type 3 years ago
Jonathan G Rennison c3c55db02b Implement road ground types for road waypoints 3 years ago
Jonathan G Rennison ace75f6864 Widen station type field in map array 3 years ago
Jonathan G Rennison 7f846aad04 Documentation: Update landscape docs for object foundation type 3 years ago
Jonathan G Rennison 06fa1ae332 Add object shore/flooding support, adjust handling of foundations
Add info to debug window
3 years ago
Jonathan G Rennison 924ffb013f Add NewGRF object property/flag to use land as object ground sprite
This handles variable ground densities, snow/desert, etc.
3 years ago
Jonathan G Rennison 74bfe4e6d2 Allow placing routing restrictions on tunnel/bridge entrance/exit signals
No reserve through support
3 years ago
Jonathan G Rennison 9e1bb3eea7 Merge tag '12.0-beta2' into jgrpp-beta
# Conflicts:
#	docs/landscape_grid.html
#	src/lang/simplified_chinese.txt
#	src/network/network_server.cpp
#	src/station_cmd.cpp
3 years ago
Jonathan G Rennison 16f2ef227b Store tunnel/bridge signal spacing on tile, adjust spacing to fit length 3 years ago
Jonathan G Rennison b2ef6c0de8 Add implementation of multi-aspect signalling and GRF support
Requires realistic braking

See: #247
3 years ago
Joan Josep b38712a302
Fix a18188a: "Meaningful" is misspelled in landscape grid documentation. (#9498) 3 years ago
Jonathan G Rennison f595696e97 Add map bit to suppress water flooding checks
Set if all neighbour tiles are also water
This reduces the overhead of flood checks on large maps
4 years ago
Joan Josep b7a1750863 Doc: Add labels to landscape grid description. (#8452)
(cherry picked from commit a18188ae90)
4 years ago
Joan Josep a18188ae90
Doc: Add labels to landscape grid description. (#8452) 4 years ago
Jonathan G Rennison ffe3c769a3 Add road tile cached one way state, one way road section detection 4 years ago
Jonathan G Rennison 3a75f13874 Allow drive-through road stops to be one-way 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 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 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
peter1138 c02ef3e456 Feature: Add NotRoadTypes (NRT) 5 years ago
Jonathan G Rennison 7ff252c58d Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
6 years ago
Eddi-z b242a04c7d Fix #7307: Add WaterClass to MP_TREES, set when trees are on coast tiles (#7309)
This allows allows NewGRF object/industry placement rules to treat trees on coast tiles the same as regular bare coast.
6 years ago
Jonathan G Rennison 9ef889f28f Docs: Fix error in landscape_grid.html: class 9 bridge ramp m6 6 years ago
Jonathan G Rennison 65b9a103ad Initial implementation of two rail types per tile 6 years ago
J0an Josep 8c0a6bbc4f Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid. 6 years ago
J0anJosep 41a620c1a7 Fix #6805: (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype. 6 years ago
Jonathan G Rennison 912ddc85d4 Merge remote-tracking branch 'J0anJosep/MapArrayGrid-m8' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
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
J0an Josep 94cd6d9a73 Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid. 6 years ago
J0anJosep 51d30d7e1c Fix #6805: (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype. 6 years ago
Peter Nelson bf8d7df736 Change: Extend rail types to 64 (6 bit storage) 6 years ago
Peter Nelson 5db883fbe9 Change: Move rail type bits from m3 to m8. 6 years ago
Peter Nelson 65548c37a8 Change: Extend map array by 2 bytes with a uint16. 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 2419974f19 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
6 years ago
Jonathan G Rennison 5770f1407a Signals on bridges: Shrink M2 simulated signal states field 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 d03139b241 Use separate bits for signals on bridge/tunnel entrance/exit red/green states 6 years ago
Jonathan G Rennison 315eff1112 Merge branch 'chunnel' into jgrpp 6 years ago