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 02549c5224 Merge branch 'master' into jgrpp ... # Conflicts: # cmake/CompileFlags.cmake # src/cargomonitor.cpp # src/core/CMakeLists.txt # src/economy.cpp # src/landscape.cpp # src/linkgraph/flowmapper.cpp # src/linkgraph/linkgraph_gui.cpp # src/linkgraph/linkgraphschedule.cpp # src/misc_gui.cpp # src/newgrf_generic.cpp # src/newgrf_storage.cpp # src/rail_gui.cpp # src/saveload/afterload.cpp # src/saveload/station_sl.cpp # src/script/script_gui.cpp # src/station_cmd.cpp # src/station_gui.cpp # src/string_func.h # src/terraform_cmd.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	Cleanup: remove obsolete string_compare_type	1 year ago
game_config.cpp	…
game_config.hpp	…
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	1 year ago
game_info.hpp	…
game_instance.cpp	Merge branch 'master' into jgrpp	1 year ago
game_instance.hpp	Codechange: Pass unpacked command arguments to command callbacks (except Script).	3 years ago
game_scanner.cpp	Codechange: use std::string as std::map key, instead of stredup string	1 year ago
game_scanner.hpp	Codechange: use std::string as std::map key, instead of stredup string	1 year 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