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 faa77e2605 Merge branch 'master' into jgrpp ... # Conflicts: # src/script/api/script_company.cpp # src/script/api/script_date.cpp # src/script/api/script_date.hpp # src/script/api/script_gamesettings.cpp # src/script/api/script_order.hpp # src/script/api/script_town.cpp # src/script/api/script_window.cpp		1 year 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: move windows common to AI and GS out of ai_gui	1 year ago
game_config.cpp	Cleanup: Removed SVN headers	5 years ago
game_config.hpp	Cleanup: Removed SVN headers	5 years ago
game_core.cpp	Merge branch 'master' into jgrpp	1 year ago
game_gui.cpp	Merge branch 'master' into jgrpp	1 year 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	2 years ago
game_info.hpp	Cleanup: Removed SVN headers	5 years ago
game_instance.cpp	Fix: Don't send unused tile field over the network (#10507)	1 year ago
game_instance.hpp	Codechange: Pass unpacked command arguments to command callbacks (except Script).	3 years ago
game_scanner.cpp	Codechange: use C++11 constructs for for-each loops (#8432)	4 years ago
game_scanner.hpp	Cleanup: Removed SVN headers	5 years ago
game_text.cpp	Merge branch 'master' into jgrpp	1 year ago
game_text.hpp	Change: [Script] Improve ScriptText validation error messages	1 year ago