You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/pathfinder
Jonathan G Rennison 8581808952 Merge tag '14.0-beta2' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/cargotype.cpp
#	src/console_cmds.cpp
#	src/graph_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/misc_gui.cpp
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_town.cpp
#	src/object_cmd.cpp
#	src/openttd.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/table/build_industry.h
#	src/table/engines.h
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
3 months ago
..
npf Merge branch 'master' into jgrpp 4 months ago
yapf Merge tag '14.0-beta1' into jgrpp 3 months ago
CMakeLists.txt Feature: Region-based pathfinder for ships (#10543) 5 months ago
follow_track.hpp Re-order various structs to reduce holes/padding 4 months ago
pathfinder_func.h Merge branch 'master' into jgrpp 5 months ago
pathfinder_type.h Cleanup: Remove unused constant YAPF_SHIP_PATH_CACHE_LENGTH 5 months ago
water_regions.cpp Merge tag '14.0-beta2' into jgrpp 3 months ago
water_regions.h Merge tag '14.0-beta2' into jgrpp 3 months ago