Update client binaries & configuration

- Various bugfixes - Revert player extra options panel from XNAWindow to XNAPanel, configuration in GameLobbyBase.ini updated accordingly and PlayerExtraOptionsPanel.ini removed
Starkku · Sep 7, 2023 · 1e1af67 · 1e1af67
1 parent 6a44771
commit 1e1af67
Show file tree

Hide file tree

Showing 40 changed files with 45 additions and 48 deletions.
diff --git a/ClientFiles/Resources/Binaries/OpenGL/ClientCore.dll b/ClientFiles/Resources/Binaries/OpenGL/ClientCore.dll
diff --git a/ClientFiles/Resources/Binaries/OpenGL/ClientCore.pdb b/ClientFiles/Resources/Binaries/OpenGL/ClientCore.pdb
diff --git a/ClientFiles/Resources/Binaries/OpenGL/ClientGUI.dll b/ClientFiles/Resources/Binaries/OpenGL/ClientGUI.dll
diff --git a/ClientFiles/Resources/Binaries/OpenGL/ClientGUI.pdb b/ClientFiles/Resources/Binaries/OpenGL/ClientGUI.pdb
diff --git a/ClientFiles/Resources/Binaries/OpenGL/DTAConfig.dll b/ClientFiles/Resources/Binaries/OpenGL/DTAConfig.dll
diff --git a/ClientFiles/Resources/Binaries/OpenGL/DTAConfig.pdb b/ClientFiles/Resources/Binaries/OpenGL/DTAConfig.pdb
diff --git a/ClientFiles/Resources/Binaries/OpenGL/clientogl.deps.json b/ClientFiles/Resources/Binaries/OpenGL/clientogl.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "clientogl/2.8.0-beta0218": {
+      "clientogl/2.8.0-extraoptions-pan0001": {
         "dependencies": {
           "DTAConfig": "2.2.0",
           "DiscordRichPresence": "1.1.3.18",
@@ -1284,7 +1284,7 @@
     }
   },
   "libraries": {
-    "clientogl/2.8.0-beta0218": {
+    "clientogl/2.8.0-extraoptions-pan0001": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/ClientFiles/Resources/Binaries/OpenGL/clientogl.dll b/ClientFiles/Resources/Binaries/OpenGL/clientogl.dll
diff --git a/ClientFiles/Resources/Binaries/OpenGL/clientogl.pdb b/ClientFiles/Resources/Binaries/OpenGL/clientogl.pdb
diff --git a/ClientFiles/Resources/Binaries/UniversalGL/ClientCore.dll b/ClientFiles/Resources/Binaries/UniversalGL/ClientCore.dll
diff --git a/ClientFiles/Resources/Binaries/UniversalGL/ClientCore.pdb b/ClientFiles/Resources/Binaries/UniversalGL/ClientCore.pdb
diff --git a/ClientFiles/Resources/Binaries/UniversalGL/ClientGUI.dll b/ClientFiles/Resources/Binaries/UniversalGL/ClientGUI.dll
diff --git a/ClientFiles/Resources/Binaries/UniversalGL/ClientGUI.pdb b/ClientFiles/Resources/Binaries/UniversalGL/ClientGUI.pdb
diff --git a/ClientFiles/Resources/Binaries/UniversalGL/DTAConfig.dll b/ClientFiles/Resources/Binaries/UniversalGL/DTAConfig.dll
diff --git a/ClientFiles/Resources/Binaries/UniversalGL/DTAConfig.pdb b/ClientFiles/Resources/Binaries/UniversalGL/DTAConfig.pdb
diff --git a/ClientFiles/Resources/Binaries/UniversalGL/clientogl.deps.json b/ClientFiles/Resources/Binaries/UniversalGL/clientogl.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "clientogl/2.8.0-beta0218": {
+      "clientogl/2.8.0-extraoptions-pan0001": {
         "dependencies": {
           "DTAConfig": "2.2.0",
           "DiscordRichPresence": "1.1.3.18",
@@ -1375,7 +1375,7 @@
     }
   },
   "libraries": {
-    "clientogl/2.8.0-beta0218": {
+    "clientogl/2.8.0-extraoptions-pan0001": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/ClientFiles/Resources/Binaries/UniversalGL/clientogl.dll b/ClientFiles/Resources/Binaries/UniversalGL/clientogl.dll
diff --git a/ClientFiles/Resources/Binaries/UniversalGL/clientogl.pdb b/ClientFiles/Resources/Binaries/UniversalGL/clientogl.pdb
diff --git a/ClientFiles/Resources/Binaries/Windows/ClientCore.dll b/ClientFiles/Resources/Binaries/Windows/ClientCore.dll
diff --git a/ClientFiles/Resources/Binaries/Windows/ClientCore.pdb b/ClientFiles/Resources/Binaries/Windows/ClientCore.pdb
diff --git a/ClientFiles/Resources/Binaries/Windows/ClientGUI.dll b/ClientFiles/Resources/Binaries/Windows/ClientGUI.dll
diff --git a/ClientFiles/Resources/Binaries/Windows/ClientGUI.pdb b/ClientFiles/Resources/Binaries/Windows/ClientGUI.pdb
diff --git a/ClientFiles/Resources/Binaries/Windows/DTAConfig.dll b/ClientFiles/Resources/Binaries/Windows/DTAConfig.dll
diff --git a/ClientFiles/Resources/Binaries/Windows/DTAConfig.pdb b/ClientFiles/Resources/Binaries/Windows/DTAConfig.pdb
diff --git a/ClientFiles/Resources/Binaries/Windows/clientdx.deps.json b/ClientFiles/Resources/Binaries/Windows/clientdx.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "clientdx/2.8.0-beta0218": {
+      "clientdx/2.8.0-extraoptions-pan0001": {
         "dependencies": {
           "DTAConfig": "2.2.0",
           "DiscordRichPresence": "1.1.3.18",
@@ -2008,7 +2008,7 @@
     }
   },
   "libraries": {
-    "clientdx/2.8.0-beta0218": {
+    "clientdx/2.8.0-extraoptions-pan0001": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/ClientFiles/Resources/Binaries/Windows/clientdx.dll b/ClientFiles/Resources/Binaries/Windows/clientdx.dll
diff --git a/ClientFiles/Resources/Binaries/Windows/clientdx.pdb b/ClientFiles/Resources/Binaries/Windows/clientdx.pdb
diff --git a/ClientFiles/Resources/Binaries/XNA/ClientCore.dll b/ClientFiles/Resources/Binaries/XNA/ClientCore.dll
diff --git a/ClientFiles/Resources/Binaries/XNA/ClientCore.pdb b/ClientFiles/Resources/Binaries/XNA/ClientCore.pdb
diff --git a/ClientFiles/Resources/Binaries/XNA/ClientGUI.dll b/ClientFiles/Resources/Binaries/XNA/ClientGUI.dll
diff --git a/ClientFiles/Resources/Binaries/XNA/ClientGUI.pdb b/ClientFiles/Resources/Binaries/XNA/ClientGUI.pdb
diff --git a/ClientFiles/Resources/Binaries/XNA/DTAConfig.dll b/ClientFiles/Resources/Binaries/XNA/DTAConfig.dll
diff --git a/ClientFiles/Resources/Binaries/XNA/DTAConfig.pdb b/ClientFiles/Resources/Binaries/XNA/DTAConfig.pdb
diff --git a/ClientFiles/Resources/Binaries/XNA/clientxna.deps.json b/ClientFiles/Resources/Binaries/XNA/clientxna.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v7.0": {},
     ".NETCoreApp,Version=v7.0/win-x86": {
-      "clientxna/2.8.0-beta0218": {
+      "clientxna/2.8.0-extraoptions-pan0001": {
         "dependencies": {
           "DTAConfig": "2.2.0",
           "DiscordRichPresence": "1.1.3.18",
@@ -1427,7 +1427,7 @@
     }
   },
   "libraries": {
-    "clientxna/2.8.0-beta0218": {
+    "clientxna/2.8.0-extraoptions-pan0001": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

diff --git a/ClientFiles/Resources/Binaries/XNA/clientxna.dll b/ClientFiles/Resources/Binaries/XNA/clientxna.dll
diff --git a/ClientFiles/Resources/Binaries/XNA/clientxna.pdb b/ClientFiles/Resources/Binaries/XNA/clientxna.pdb
diff --git a/ClientFiles/Resources/ClientDefinitions.ini b/ClientFiles/Resources/ClientDefinitions.ini
@@ -9,7 +9,7 @@ WindowTitle=YR Mod Client
 ; Full name of the game shown in log / error messages.
 LongGameName=YR Mod
 ; The local game, corresponding to game definitions in ClientCore or GameCollectionConfig.ini.
-LocalGame=
+LocalGame=YR
 ; CnCNet 5 live status identifier.
 CnCNetLiveStatusIdentifier=
 ; The executable that is started by the client after creating the .dxfail file if DirectX11 initialization fails.

diff --git a/ClientFiles/Resources/GameCollectionConfig.ini b/ClientFiles/Resources/GameCollectionConfig.ini
@@ -1,6 +1,6 @@
 ; List of custom CnCNet games / mods.
 [CustomGames]
-0=CustomGame
+;0=CustomGame
 
 [CustomGame]
 ; Internal game name, should match LocalGame in ClientDefinitions.ini (case-insensitive). Maximum length is 4 characters.

diff --git a/ClientFiles/Resources/GameLobbyBase.ini b/ClientFiles/Resources/GameLobbyBase.ini
@@ -168,15 +168,48 @@ $Y=EMPTY_SPACE_TOP
 $Width=getWidth($ParentControl) - (getX($Self) + (getWidth(GameOptionsPanel) + LOBBY_EMPTY_SPACE_SIDES + LOBBY_PANEL_SPACING)
 $Height=getHeight(GameOptionsPanel)
 SolidColorBackgroundTexture=0,0,0,128
-
 $CC00=btnPlayerExtraOptionsOpen:XNAClientButton
 
 [PlayerExtraOptionsPanel]
 $Width=238
 $Height=247
 $X=getRight(PlayerOptionsPanel) - getWidth($Self)
 $Y=getY(PlayerOptionsPanel)
-SolidColorBackgroundTexture=0,0,0,128
+
+[PlayerExtraOptionsPanel_btnClose]
+Location=220,0
+Size=18,18
+
+[PlayerExtraOptionsPanel_lblHeader]
+Location=12,6
+
+[PlayerExtraOptionsPanel_chkBoxForceRandomSides]
+Location=12,28
+
+[PlayerExtraOptionsPanel_chkBoxForceRandomColors]
+Location=12,50
+
+[PlayerExtraOptionsPanel_chkBoxForceRandomTeams]
+Location=12,72
+
+[PlayerExtraOptionsPanel_chkBoxForceRandomStarts]
+Location=12,94
+
+[PlayerExtraOptionsPanel_chkBoxUseTeamStartMappings]
+Location=12,130
+
+[PlayerExtraOptionsPanel_btnHelp]
+Location=160,130
+
+[PlayerExtraOptionsPanel_lblPreset]
+Location=12,156
+
+[PlayerExtraOptionsPanel_ddTeamStartMappingPreset]
+Size=157,21
+Location=65,154
+
+[PlayerExtraOptionsPanel_teamStartMappingsPanel]
+Location=12,189
 
 [btnPlayerExtraOptionsOpen]
 $Width=OPEN_BUTTON_WIDTH

diff --git a/ClientFiles/Resources/PlayerExtraOptionsPanel.ini b/ClientFiles/Resources/PlayerExtraOptionsPanel.ini