Merge branch 'develop' into pr/916

Author: SadPencil

.github/copilot-coding-agent-setup.md

@@ -25,10 +25,14 @@ Run all three commands unconditionally:
 - `set-branches` resets the remote's fetch refspec to the standard glob `+refs/heads/*:refs/remotes/origin/*`, removing any single-branch refspec that a shallow clone may have injected. Without this, LibGit2Sharp (used by GitVersion 5.12.0) crashes with `ref 'refs/remotes/origin/develop' doesn't match the destination` because it iterates refspecs in order and fails on the first non-matching one instead of falling through to the glob.
 - The final fetch brings `refs/remotes/origin/develop` into the local ref store through that glob refspec so GitVersion can find it.
 
+The same fix must be applied to every submodule recursively: `Rampastring.XNAUI` and its nested `Rampastring.Tools` submodule also carry `GitVersion.MsBuild` and are subject to the same crash when checked out with a narrow single-branch refspec.
+
 ```shell
 git fetch --unshallow origin || true
 git remote set-branches origin '*'
 git fetch origin develop
+git submodule foreach --recursive \
+  'git fetch --unshallow origin || true; git remote set-branches origin "*"; git fetch origin'
 ```
 
 ## Step 3 — Restore NuGet packages

.github/workflows/copilot-setup-steps.yml

@@ -32,6 +32,11 @@ jobs:
           git fetch --unshallow origin || true
           git remote set-branches origin '*'
           git fetch origin develop
+          # Apply the same fix to every submodule (including nested ones), because GitVersion.MsBuild
+          # runs against each submodule directory that carries it, and the same LibGit2Sharp refspec
+          # crash occurs there when the submodule was checked out with a narrow single-branch refspec.
+          git submodule foreach --recursive \
+            'git fetch --unshallow origin || true; git remote set-branches origin "*"; git fetch origin'
 
       - name: Set up .NET SDK
         uses: actions/setup-dotnet@v4
@@ -40,3 +45,6 @@ jobs:
 
       - name: Restore NuGet packages
         run: dotnet restore -p:Configuration=UniversalGLRelease
+
+      - name: Build
+        run: dotnet build DXMainClient/DXMainClient.csproj -p:Configuration=UniversalGLRelease -f net8.0 --no-restore

ClientCore/ClientConfiguration.cs

@@ -365,6 +365,13 @@ private List<TranslationGameFile> ParseTranslationGameFiles()
 
         public string KeyboardINI => clientDefinitionsIni.GetStringValue(SETTINGS, "KeyboardINI", "Keyboard.ini");
 
+        public bool SettingsIniAsKeyboardIni => SettingsIniName == KeyboardINI;
+
+        public string KeyboardHotkeySection => clientDefinitionsIni.GetStringValue(
+            SETTINGS,
+            "KeyboardHotkeySection",
+            ClientGameType == ClientType.RA ? "WinHotKeys" : "Hotkey");
+
         public int MinimumIngameWidth => clientDefinitionsIni.GetIntValue(SETTINGS, "MinimumIngameWidth", 640);
 
         public int MinimumIngameHeight => clientDefinitionsIni.GetIntValue(SETTINGS, "MinimumIngameHeight", 480);

ClientCore/Settings/UserINISettings.cs

@@ -93,10 +93,22 @@ protected UserINISettings(IniFile iniFile)
             else
                 BackBufferInVRAM = new BoolSetting(iniFile, VIDEO, "VideoBackBuffer", false);
 
-            IngameScreenWidth = new IntSetting(iniFile, VIDEO, "ScreenWidth", 1024);
-            IngameScreenHeight = new IntSetting(iniFile, VIDEO, "ScreenHeight", 768);
+            IngameScreenWidth = new IntSetting(
+                iniFile,
+                ClientConfiguration.Instance.ClientGameType == ClientType.RA ? OPTIONS : VIDEO,
+                ClientConfiguration.Instance.ClientGameType == ClientType.RA ? "Width" : "ScreenWidth",
+                1024);
+
+            IngameScreenHeight = new IntSetting(
+                iniFile,
+                ClientConfiguration.Instance.ClientGameType == ClientType.RA ? OPTIONS : VIDEO,
+                ClientConfiguration.Instance.ClientGameType == ClientType.RA ? "Height" : "ScreenHeight",
+                768);
+
             ClientTheme = new StringSetting(iniFile, MULTIPLAYER, "Theme", ClientConfiguration.Instance.GetThemeInfoFromIndex(0).Name);
             Translation = new StringSetting(iniFile, OPTIONS, "Translation", I18N.Translation.GetDefaultTranslationLocaleCode());
+            TranslationGameFilesVersion = new StringSetting(iniFile, OPTIONS, nameof(TranslationGameFilesVersion), string.Empty);
+
             DetailLevel = new IntSetting(iniFile, OPTIONS, "DetailLevel", 2);
             Renderer = new StringSetting(iniFile, COMPATIBILITY, "Renderer", string.Empty);
             WindowedMode = new BoolSetting(iniFile, VIDEO, ClientConfiguration.Instance.WindowedModeKey, false);
@@ -106,8 +118,17 @@ protected UserINISettings(IniFile iniFile)
             ClientFPS = new IntSetting(iniFile, VIDEO, "ClientFPS", 60);
             DisplayToggleableExtraTextures = new BoolSetting(iniFile, VIDEO, "DisplayToggleableExtraTextures", true);
 
-            ScoreVolume = new DoubleSetting(iniFile, AUDIO, "ScoreVolume", 0.7);
-            SoundVolume = new DoubleSetting(iniFile, AUDIO, "SoundVolume", 0.7);
+            // RA1 reads MultiplayerScoreVolume instead of ScoreVolume. This value is handled when saving
+            ScoreVolume = new DoubleSetting(iniFile,
+                ClientConfiguration.Instance.ClientGameType == ClientType.RA ? OPTIONS : AUDIO,
+                "ScoreVolume",
+                0.7);
+
+            SoundVolume = new DoubleSetting(iniFile,
+                ClientConfiguration.Instance.ClientGameType == ClientType.RA ? OPTIONS : AUDIO,
+                ClientConfiguration.Instance.ClientGameType == ClientType.RA ? "Volume" : "SoundVolume",
+                0.7);
+
             VoiceVolume = new DoubleSetting(iniFile, AUDIO, "VoiceVolume", 0.7);
             IsScoreShuffle = new BoolSetting(iniFile, AUDIO, "IsScoreShuffle", true);
             ClientVolume = new DoubleSetting(iniFile, AUDIO, "ClientVolume", 1.0);
@@ -176,9 +197,11 @@ protected UserINISettings(IniFile iniFile)
 
         public IntSetting IngameScreenWidth { get; private set; }
         public IntSetting IngameScreenHeight { get; private set; }
+
         public StringSetting ClientTheme { get; private set; }
         public string ThemeFolderPath => ClientConfiguration.Instance.GetThemePath(ClientTheme);
         public StringSetting Translation { get; private set; }
+        public StringSetting TranslationGameFilesVersion { get; private set; }
         public string TranslationFolderPath => SafePath.CombineDirectoryPath(
             ClientConfiguration.Instance.TranslationsFolderPath, Translation);
         public string TranslationThemeFolderPath => SafePath.CombineDirectoryPath(
@@ -447,6 +470,10 @@ public void SaveSettings()
             ApplyDefaults();
             // CleanUpLegacySettings();
 
+            // RA1 reads MultiplayerScoreVolume instead of ScoreVolume
+            if (ClientConfiguration.Instance.ClientGameType == ClientType.RA)
+                SettingsIni.SetDoubleValue(OPTIONS, "MultiplayerScoreVolume", SettingsIni.GetDoubleValue(OPTIONS, "ScoreVolume", 0.7));
+
             SettingsIni.WriteIniFile();
 
             SettingsSaved?.Invoke(this, EventArgs.Empty);