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 2e06374f6f Merge branch 'master' into jgrpp ... # Conflicts: # src/build_vehicle_gui.cpp # src/company_gui.cpp # src/gfx_func.h # src/group_gui.cpp # src/industry_gui.cpp # src/misc_gui.cpp # src/news_gui.cpp # src/settings_gui.cpp # src/ship_gui.cpp # src/smallmap_gui.cpp # src/station_gui.cpp # src/subsidy_gui.cpp # src/timetable_gui.cpp # src/toolbar_gui.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/viewport.cpp # src/widget.cpp # src/widgets/dropdown.cpp # src/window.cpp		6 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	11 months ago
game_gui.cpp	Merge branch 'master' into jgrpp	6 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	Merge branch 'master' into jgrpp	11 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	7 months ago
game_text.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago