Merge remote-tracking branch 'upstream/master' into sidequest/single-soldier-coin-training

# Conflicts:
#	libs/s25main/addons/const_addons.h
#	tests/s25Main/integration/testAttacking.cpp

Author: DevOpsOfChaos

.github/workflows/unit-tests.yml

@@ -220,7 +220,7 @@ jobs:
 
       - name: Upload coverage (Codecov)
         if: matrix.coverage && success()
-        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           fail_ci_if_error: true
           disable_search: true

Jenkinsfile

@@ -49,6 +49,7 @@ pipeline {
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '14', daysToKeepStr: '14', numToKeepStr: '180'))
         disableConcurrentBuilds()
+        disableResume()
         skipDefaultCheckout(true)
     }
 

data/RTTR/texte/keyboardlayout.txt

@@ -31,6 +31,7 @@ F9:................... Readme
 F10:.................. Settings (UI, ...)
 F11:.................. Musicplayer
 F12:.................. Options window
+Print:................ Take screenshot
 
 Post office:
 

doc/lua/functions.md

@@ -238,6 +238,7 @@ Closes a spot kicking any player or AI there.
 
 **SetAI(level)**  
 Add an AI or change its difficulty.
+Switching a slot to an AI assigns the AI's default name. If a custom name should be kept, call `SetName(name)` after `SetAI(level)`.
 
 **SetName(name)**  
 Change the player's name.

external/languages

@@ -88,7 +88,7 @@ void WaitForEnter()
     if(waited)
         return;
     waited = true;
-    bnw::cout << "\n\nPress ENTER to close this window . . ." << std::endl;
+    bnw::cerr << "\n\nPress ENTER to close this window . . .\n";
     bnw::cin.clear();
     bnw::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
     bnw::cin.get();
@@ -244,39 +244,12 @@ void InstallSignalHandlers()
 #endif // _MSC_VER
 }
 
-void UninstallSignalHandlers()
-{
-#ifdef _WIN32
-    SetConsoleCtrlHandler(ConsoleSignalHandler, FALSE);
-#else
-    struct sigaction sa;
-    sa.sa_handler = SIG_DFL;
-    sa.sa_flags = 0; // SA_RESTART would not allow to interrupt connect call;
-    sigemptyset(&sa.sa_mask);
-
-    sigaction(SIGINT, &sa, nullptr);
-    sigaction(SIGPIPE, &sa, nullptr);
-    sigaction(SIGALRM, &sa, nullptr);
-#endif // _WIN32
-
-#ifdef _MSC_VER
-    SetUnhandledExceptionFilter(nullptr);
-#else
-    signal(SIGSEGV, SIG_DFL);
-#endif
-}
-
 /**
  *  Exit-Handler, wird bei @p exit ausgeführt.
  */
 void ExitHandler()
 {
     Socket::Shutdown();
-    UninstallSignalHandlers();
-
-#ifdef _DEBUG
-    WaitForEnter();
-#endif
 }
 
 void SetAppSymbol()

external/libutil

@@ -57,6 +57,7 @@ void CheatCommandTracker::onSpecialKeyEvent(const KeyEvent& ke)
 
     switch(ke.kt)
     {
+        case KeyType::F6: cheats_.toggleHumanAIPlayer(); break;
         case KeyType::F7:
         {
             if(ke.alt)
@@ -65,7 +66,6 @@ void CheatCommandTracker::onSpecialKeyEvent(const KeyEvent& ke)
                 cheats_.toggleAllVisible();
         }
         break;
-        case KeyType::F10: cheats_.toggleHumanAIPlayer(); break;
         default: break;
     }
 }

external/turtle

@@ -105,7 +105,11 @@ void GlobalGameSettings::registerAllAddons()
         AddonWine,
         AddonLeather,
         AddonNoArmorDefault,
-        AddonArmorCapturedBld
+        AddonArmorCapturedBld,
+        AddonForesterFarmFieldAvoidance,
+        AddonForesterReachRadius,
+        AddonWoodcutterReachRadius,
+        AddonStonemasonReachRadius
     >;
     // clang-format on
     using namespace boost::mp11;