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/yapf
Jonathan G Rennison 7f6b1d6b94 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
5 months ago
..
CMakeLists.txt
nodelist.hpp Merge branch 'master' into jgrpp 5 months ago
yapf.h Merge branch 'master' into jgrpp 2 years ago
yapf.hpp Remove: performance measurements in YAPF 3 years ago
yapf_base.hpp Merge branch 'master' into jgrpp 5 months ago
yapf_cache.h
yapf_common.hpp Merge branch 'master' into jgrpp 5 months ago
yapf_costbase.hpp
yapf_costcache.hpp Merge branch 'master' into jgrpp 5 months ago
yapf_costrail.hpp Merge branch 'master' into jgrpp 5 months ago
yapf_destrail.hpp Merge branch 'master' into jgrpp 5 months ago
yapf_node.hpp Merge branch 'master' into jgrpp 5 months ago
yapf_node_rail.hpp Merge branch 'master' into jgrpp 5 months ago
yapf_node_road.hpp
yapf_node_ship.hpp
yapf_rail.cpp Merge branch 'master' into jgrpp 5 months ago
yapf_road.cpp Merge branch 'master' into jgrpp 5 months ago
yapf_ship.cpp Merge branch 'master' into jgrpp 5 months ago
yapf_type.hpp Reverse behind signal pathfinding now takes into account train length 3 years ago