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 1f36c3f3e4 Merge branch 'master' into jgrpp ... # Conflicts: # src/ai/ai_gui.cpp # src/build_vehicle_gui.cpp # src/genworld_gui.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/korean.txt # src/newgrf_sound.cpp # src/roadveh.h # src/sound.cpp # src/station_cmd.cpp # src/train.h # src/train_cmd.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_gui.cpp		2 years ago
..
CMakeLists.txt	Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058)	2 years ago
game.hpp	Fix #10073: Stop truncating output of list_ai and friends commands	2 years 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	2 years ago
game_gui.cpp	Merge branch 'master' into jgrpp	2 years 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-beta	3 years ago
game_info.hpp	Cleanup: Removed SVN headers	5 years ago
game_instance.cpp	Codechange: Add support for additional command result values.	3 years 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	Cleanup: remove some unneeded c_str() calls	3 years ago
game_text.hpp	Codechange: Store GS lang texts in std::strings.	4 years ago