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.

Jonathan G Rennison fe730bce31 Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/codeql.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows.yml # src/map.cpp # src/music/midifile.hpp # src/order_cmd.cpp # src/order_gui.cpp # src/pathfinder/yapf/yapf_rail.cpp # src/pbs.cpp # src/saveload/afterload.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/script/api/script_text.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_func.h # src/vehicle_gui.cpp # src/vehicle_gui_base.h # src/viewport.cpp # src/waypoint_cmd.cpp		3 months ago
..
npf	Merge branch 'master' into jgrpp	3 months ago
yapf	Merge branch 'master' into jgrpp	3 months ago
CMakeLists.txt	Feature: Region-based pathfinder for ships (#10543)	5 months ago
follow_track.hpp	Merge branch 'master' into jgrpp	3 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	Codechange: Skip non-water water region patches in neigbor search	3 months ago
water_regions.h	Codechange: Skip non-water water region patches in neigbor search	3 months ago