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 0150f8f570 Merge branch 'master' into jgrpp ... # Conflicts: # src/network/network_server.cpp		1 month ago
..
CMakeLists.txt	Feature: Region-based pathfinder for ships (#10543)	5 months ago
nodelist.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf.h	Codechange: Where the ship comes from is already known	3 months ago
yapf.hpp	…
yapf_base.hpp	Merge branch 'master' into jgrpp	3 months ago
yapf_cache.h	…
yapf_common.hpp	Merge branch 'master' into jgrpp	4 months ago
yapf_costbase.hpp	…
yapf_costcache.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf_costrail.hpp	Merge branch 'master' into jgrpp	4 months ago
yapf_destrail.hpp	Merge tag '14.0-beta1' into jgrpp	3 months ago
yapf_node.hpp	Merge branch 'master' into jgrpp	5 months ago
yapf_node_rail.hpp	Re-order various structs to reduce holes/padding	4 months ago
yapf_node_road.hpp	…
yapf_node_ship.hpp	…
yapf_rail.cpp	Merge branch 'master' into jgrpp	3 months ago
yapf_road.cpp	Merge branch 'master' into jgrpp	4 months ago
yapf_ship.cpp	Merge branch 'master' into jgrpp	1 month ago
yapf_ship_regions.cpp	Codechange: Skip non-water water region patches in neigbor search	3 months ago
yapf_ship_regions.h	Feature: Region-based pathfinder for ships (#10543)	5 months ago
yapf_type.hpp	…