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 828d2146eb Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # bin/ai/CMakeLists.txt # bin/game/CMakeLists.txt # src/ai/ai_info.cpp # src/company_base.h # src/economy.cpp # src/game/game_info.cpp # src/gfx_type.h # src/linkgraph/linkgraph_gui.cpp # src/palette.cpp # src/palette_func.h # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle_base.h # src/window.cpp # src/window_func.h		3 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	Merge branch 'master' into jgrpp	3 months 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	3 months ago
game_gui.cpp	Merge branch 'master' into jgrpp	3 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	Merge branch 'master' into jgrpp	3 months ago
game_info.hpp	Codechange: use std::string for script library category	1 year ago
game_instance.cpp	Fix: [Script] Only show debug script window at the end of savegame loading (#12135)	3 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 tag '14.0-beta1' into jgrpp	3 months ago
game_text.hpp	Merge branch 'master' into jgrpp	4 months ago