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 784fcbd1e7 Merge branch 'master' into jgrpp-beta ... # Conflicts: # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/table/currency_settings.ini # src/table/gameopt_settings.ini # src/table/misc_settings.ini # src/table/settings.h.preamble		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: Use std::string in file scanners.	4 years ago
script_info.hpp	Codechange: Use std::string in file scanners.	4 years ago
script_info_dummy.cpp	Change: Use gender-neutral pronouns	3 years ago
script_instance.cpp	Fix #9353: [Script] Garbage collecting on priority queues could crash the game	3 years ago
script_instance.hpp	Merge branch 'jgrpp' into jgrpp-beta	3 years ago
script_scanner.cpp	Codechange: Replace FOR_ALL_TARS with range-based for loops	3 years ago
script_scanner.hpp	Codechange: Use std::string in file scanners.	4 years ago
script_storage.hpp	…
script_suspend.hpp	…
squirrel.cpp	Fix #9548, e5fedcd: [Squirrel] Crash during engine cleanup after reaching memory limit on realloc (#9592)	3 years ago
squirrel.hpp	…
squirrel_class.hpp	Change: Use gender-neutral pronouns in console command messages (and comments) (#9203)	3 years ago
squirrel_helper.hpp	…
squirrel_helper_type.hpp	…
squirrel_std.cpp	Codechange: Remove min/max functions in favour of STL variants (#8502)	4 years ago
squirrel_std.hpp	…