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 62afd94b47 Merge branch 'master' into jgrpp-beta ... # Conflicts: # src/company_cmd.cpp # src/economy.cpp # src/lang/swedish.txt # src/network/network_command.cpp # src/news_gui.cpp # src/saveload/saveload.h # src/script/api/script_list.cpp # src/video/cocoa/cocoa_v.mm # src/video/sdl2_v.cpp		3 years ago
..
api	Merge branch 'master' into jgrpp-beta	3 years ago
CMakeLists.txt	…
script_config.cpp	Codechange: move script settings to std::string	3 years ago
script_config.hpp	Change: Use gender-neutral pronouns	3 years ago
script_fatalerror.hpp	Change: [Script] Let Script_FatalError use std::string instead of const char *	3 years ago
script_info.cpp	Codechange: move casting a "const char *" to "char *" to the caller	3 years ago
script_info.hpp	…
script_info_dummy.cpp	Change: Use gender-neutral pronouns	3 years ago
script_instance.cpp	Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415)	3 years ago
script_instance.hpp	Merge branch 'jgrpp' into jgrpp-beta	3 years ago
script_scanner.cpp	Cleanup: remove some unneeded c_str() calls	3 years ago
script_scanner.hpp	…
script_storage.hpp	…
script_suspend.hpp	…
squirrel.cpp	Merge branch 'master' into jgrpp-beta	3 years ago
squirrel.hpp	Merge branch 'master' into jgrpp-beta	3 years ago
squirrel_class.hpp	Change: Use gender-neutral pronouns in console command messages (and comments) (#9203)	3 years ago
squirrel_helper.hpp	Cleanup: [Script] Use nullptr instead of 0 or NULL	3 years ago
squirrel_helper_type.hpp	…
squirrel_std.cpp	Codechange: convert printf DEBUG statements to fmt Debug statements	3 years ago
squirrel_std.hpp	…