Jonathan G Rennison 1518c2fa1e Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/depot_type.h
#	src/lang/german.txt
#	src/order_gui.cpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/script/api/script_window.hpp.in
#	src/settings_table.cpp
#	src/train_cmd.cpp

2022-11-05 17:19:00 +00:00

..

npf

Initial implementation of road waypoints

2022-01-26 21:46:36 +00:00

yapf

Merge branch 'master' into jgrpp

2022-11-05 17:19:00 +00:00

CMakeLists.txt

Remove: performance measurements in YAPF

2021-04-30 18:04:57 +01:00

follow_track.hpp

Change various asserts to not be included in release builds

2022-10-22 12:34:54 +01:00

pathfinder_func.h

Fix #8123: trams on half-tiles couldn't find depots (#8738)

2021-02-25 22:46:46 +01:00

pathfinder_type.h

Merge branch 'master' into jgrpp

2020-02-09 15:43:47 +00:00