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	Add: introduce CMake for project management	4 years ago
ai.hpp	Merge branch 'master' into jgrpp	2 months ago
ai_config.cpp	Change: Store running AI config inside Company (#12003)	3 months ago
ai_config.hpp	Codechange: use std::string for script info/library finding	12 months ago
ai_core.cpp	Merge branch 'master' into jgrpp	2 months ago
ai_gui.cpp	Merge tag '14.0-beta2' into jgrpp	2 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	2 months ago
ai_info.hpp	Codechange: use std::string for script library category	12 months ago
ai_instance.cpp	Fix: [Script] Only show debug script window at the end of savegame loading (#12135)	2 months ago
ai_instance.hpp	Merge branch 'master' into jgrpp	10 months ago
ai_scanner.cpp	Merge branch 'master' into jgrpp	5 months ago
ai_scanner.hpp	Codechange: use std::string for script info/library finding	12 months ago