Jonathan G Rennison 5404be172c Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/core/bitmath_func.cpp
#	src/core/bitmath_func.hpp
#	src/core/geometry_type.hpp
#	src/game/game_text.hpp
#	src/graph_gui.cpp
#	src/pathfinder/npf/npf.cpp
#	src/script/api/script_text.cpp
#	src/spritecache.cpp
#	src/track_func.h

2024-01-25 22:36:01 +00:00

..

npf

Merge branch 'master' into jgrpp

2024-01-25 22:36:01 +00:00

yapf

Merge branch 'master' into jgrpp

2024-01-25 22:36:01 +00:00

CMakeLists.txt

Feature: Region-based pathfinder for ships (#10543)

2024-01-08 20:29:05 +01:00

follow_track.hpp

Re-order various structs to reduce holes/padding

2024-01-24 23:17:53 +00:00

pathfinder_func.h

Merge branch 'master' into jgrpp

2024-01-07 15:00:16 +00:00

pathfinder_type.h

Cleanup: Remove unused constant YAPF_SHIP_PATH_CACHE_LENGTH

2024-01-09 20:58:51 +01:00

water_regions.cpp

Use array unique_ptr for water regions

2024-01-10 19:19:28 +00:00

water_regions.h

Use array unique_ptr for water regions

2024-01-10 19:19:28 +00:00