Jonathan G Rennison 4042480806 Merge branch 'jgrpp' into jgrpp-beta ...

# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini

2021-10-08 18:12:04 +01:00

..

api

Merge branch 'jgrpp' into jgrpp-beta

2021-10-08 18:12:04 +01:00

CMakeLists.txt

Add: [CMake] Option to only build tools/docs

2020-12-13 22:46:46 +01:00

script_config.cpp

Codechange: move script settings to std::string

2021-05-13 23:13:17 +02:00

script_config.hpp

Change: Use gender-neutral pronouns

2021-05-15 10:16:48 +02:00

script_fatalerror.hpp

Change: [Script] Let Script_FatalError use std::string instead of const char *

2021-04-17 22:24:52 +02:00

script_info_dummy.cpp

Change: Use gender-neutral pronouns

2021-05-15 10:16:48 +02:00

script_info.cpp

Codechange: Use std::string in file scanners.

2020-12-27 13:19:25 +01:00

script_info.hpp

Codechange: Use std::string in file scanners.

2020-12-27 13:19:25 +01:00

script_instance.cpp

Fix #9353: [Script] Garbage collecting on priority queues could crash the game

2021-10-08 18:11:02 +01:00

script_instance.hpp

Merge branch 'jgrpp' into jgrpp-beta

2021-10-08 18:12:04 +01:00

script_scanner.cpp

Codechange: Replace FOR_ALL_TARS with range-based for loops

2021-05-06 21:15:07 +01:00

script_scanner.hpp

Codechange: Use std::string in file scanners.

2020-12-27 13:19:25 +01:00

script_storage.hpp

Add third DoCommand parameter p3

2020-10-17 17:25:44 +01:00

script_suspend.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

squirrel_class.hpp

Change: Use gender-neutral pronouns in console command messages (and comments) (#9203)

2021-05-14 18:15:00 +01:00

squirrel_helper_type.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

squirrel_helper.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

squirrel_std.cpp

Codechange: Remove min/max functions in favour of STL variants (#8502)

2021-01-08 11:16:18 +01:00

squirrel_std.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

squirrel.cpp

Fix #9548, e5fedcd: [Squirrel] Crash during engine cleanup after reaching memory limit on realloc (#9592)

2021-10-03 21:19:27 +01:00

squirrel.hpp

Script: Allow changing ops limit and memory limit settings in game

2020-09-14 18:04:19 +01:00