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 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		4 months ago
..
CMakeLists.txt	Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058)	2 years ago
game.hpp	Codechange: use fmt::format_to to format the help message	1 year ago
game_config.cpp	Codechange: use std::string for script info/library finding	1 year ago
game_config.hpp	Codechange: use std::string for script info/library finding	1 year ago
game_core.cpp	Merge branch 'master' into jgrpp	5 months ago
game_gui.cpp	Merge branch 'master' into jgrpp	4 months ago
game_gui.hpp	Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058)	2 years ago
game_info.cpp	Avoid std::set in script version checks	10 months ago
game_info.hpp	Codechange: use std::string for script library category	1 year ago
game_instance.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
game_instance.hpp	Merge branch 'master' into jgrpp	11 months ago
game_scanner.cpp	Merge branch 'master' into jgrpp	6 months ago
game_scanner.hpp	Codechange: use std::string for script info/library finding	1 year ago
game_text.cpp	Merge branch 'master' into jgrpp	4 months ago
game_text.hpp	Merge branch 'master' into jgrpp	4 months ago