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 0e76f774eb Merge branch 'master' into jgrpp ... # Conflicts: # src/landscape.cpp # src/landscape.h # src/misc_gui.cpp # src/newgrf_commons.cpp # src/order_cmd.cpp # src/pathfinder/yapf/yapf_base.hpp # src/station_cmd.cpp # src/tunnelbridge_cmd.cpp # src/vehicle.cpp # src/water_cmd.cpp # src/window.cpp		2 months ago
..
CMakeLists.txt	Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058)	1 year ago
game.hpp	Merge branch 'master' into jgrpp	2 months ago
game_config.cpp	Codechange: use std::string for script info/library finding	12 months ago
game_config.hpp	Codechange: use std::string for script info/library finding	12 months ago
game_core.cpp	Merge branch 'master' into jgrpp	2 months ago
game_gui.cpp	Merge branch 'master' into jgrpp	2 months ago
game_gui.hpp	Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058)	1 year ago
game_info.cpp	Merge branch 'master' into jgrpp	2 months ago
game_info.hpp	Codechange: use std::string for script library category	12 months ago
game_instance.cpp	Fix: [Script] Only show debug script window at the end of savegame loading (#12135)	2 months ago
game_instance.hpp	Merge branch 'master' into jgrpp	10 months ago
game_scanner.cpp	Merge branch 'master' into jgrpp	5 months ago
game_scanner.hpp	Codechange: use std::string for script info/library finding	12 months ago
game_text.cpp	Merge tag '14.0-beta1' into jgrpp	2 months ago
game_text.hpp	Merge branch 'master' into jgrpp	3 months ago