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 828d2146eb Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # bin/ai/CMakeLists.txt # bin/game/CMakeLists.txt # src/ai/ai_info.cpp # src/company_base.h # src/economy.cpp # src/game/game_info.cpp # src/gfx_type.h # src/linkgraph/linkgraph_gui.cpp # src/palette.cpp # src/palette_func.h # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle_base.h # src/window.cpp # src/window_func.h		3 months ago
..
api	Merge branch 'master' into jgrpp	3 months ago
CMakeLists.txt	…
script_config.cpp	Merge branch 'master' into jgrpp	4 months ago
script_config.hpp	Merge branch 'master' into jgrpp	4 months ago
script_fatalerror.hpp	…
script_gui.cpp	Merge branch 'master' into jgrpp	4 months ago
script_gui.h	Change: Allow opening multiple script debug windows by holding Ctrl.	6 months ago
script_info.cpp	Merge tag '14.0-beta1' into jgrpp	4 months ago
script_info.hpp	…
script_info_dummy.cpp	…
script_instance.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
script_instance.hpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
script_scanner.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
script_scanner.hpp	…
script_storage.hpp	Add: AI/GS Time Mode to choose between economy (default) and calendar time (#11603)	4 months ago
script_suspend.hpp	…
squirrel.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
squirrel.hpp	…
squirrel_class.hpp	…
squirrel_helper.hpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
squirrel_helper_type.hpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
squirrel_std.cpp	…
squirrel_std.hpp	…