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	Add: introduce CMake for project management	4 years ago
ai.hpp	Merge branch 'master' into jgrpp	3 months ago
ai_config.cpp	Change: Store running AI config inside Company (#12003)	4 months ago
ai_config.hpp	Codechange: use std::string for script info/library finding	1 year ago
ai_core.cpp	Fix #12133: [Script] Don't crash when emergency saving (#12138)	3 months ago
ai_gui.cpp	Merge tag '14.0-beta2' into jgrpp	3 months ago
ai_gui.hpp	Codechange: move windows common to AI and GS out of ai_gui	1 year ago
ai_info.cpp	Merge branch 'master' into jgrpp	3 months ago
ai_info.hpp	Codechange: use std::string for script library category	1 year ago
ai_instance.cpp	Fix: [Script] Only show debug script window at the end of savegame loading (#12135)	3 months ago
ai_instance.hpp	Merge branch 'master' into jgrpp	11 months ago
ai_scanner.cpp	Merge branch 'master' into jgrpp	6 months ago
ai_scanner.hpp	Codechange: use std::string for script info/library finding	1 year ago