Merge branch 'develop' into feature/migration-to-dll-spawner+ares+phobos

CnCNet · Feb 15, 2024 · b9e68c2 · b9e68c2
2 parents f1d6a5d + f0472e1
commit b9e68c2
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 12 deletions.
diff --git a/package/Resources/Binaries/OpenGL/ClientCore.dll b/package/Resources/Binaries/OpenGL/ClientCore.dll
diff --git a/package/Resources/Binaries/OpenGL/ClientGUI.dll b/package/Resources/Binaries/OpenGL/ClientGUI.dll
diff --git a/package/Resources/Binaries/OpenGL/DTAConfig.dll b/package/Resources/Binaries/OpenGL/DTAConfig.dll
diff --git a/package/Resources/Binaries/Windows/ClientCore.dll b/package/Resources/Binaries/Windows/ClientCore.dll
diff --git a/package/Resources/Binaries/Windows/ClientGUI.dll b/package/Resources/Binaries/Windows/ClientGUI.dll
diff --git a/package/Resources/Binaries/Windows/DTAConfig.dll b/package/Resources/Binaries/Windows/DTAConfig.dll
diff --git a/package/Resources/Binaries/XNA/ClientCore.dll b/package/Resources/Binaries/XNA/ClientCore.dll
diff --git a/package/Resources/Binaries/XNA/ClientGUI.dll b/package/Resources/Binaries/XNA/ClientGUI.dll
diff --git a/package/Resources/Binaries/XNA/DTAConfig.dll b/package/Resources/Binaries/XNA/DTAConfig.dll
diff --git a/package/Resources/ClientDefinitions.ini b/package/Resources/ClientDefinitions.ini
@@ -48,6 +48,10 @@ Quickmatch=Qt\CnCNetQM.exe
 LauncherExe=CnCNetYRLauncher.exe
 DiscordAppId=830497958034145300
 DisallowJoiningIncompatibleGames=true
+; 30 minutes until warning
+InactiveHostWarningMessageSeconds=1800
+; 5 minutes after warning
+InactiveHostKickSeconds=300
 
 [Links]
 Forum=https://forums.cncnet.org

diff --git a/package/Resources/OptionsWindow.ini b/package/Resources/OptionsWindow.ini
@@ -77,14 +77,15 @@ Text=Update Channel:
 [ddUpdateChannel]
 Location=102,238
 Size=97,21
-Items=Live,Beta
+Items=Live,Beta,Dev
 DefaultValue=0
 CheckFilePresence=yes
 ResetUnselectableItem=yes
 ForceApplyUnselectableItem=no
 RestartRequired=true
 Item0File0=Resources/Config/UpdaterConfig_Live.ini,updateconfig.ini,OverwriteOnMismatch
 Item1File0=Resources/Config/UpdaterConfig_Beta.ini,updateconfig.ini,OverwriteOnMismatch
+Item2File0=Resources/Config/UpdaterConfig_Dev.ini,updateconfig.ini,OverwriteOnMismatch
 ToolTip=Switch between update Channels. Requires client restart.
 Enabled=true
 

diff --git a/package/Resources/clientdx.exe b/package/Resources/clientdx.exe
diff --git a/package/Resources/clientogl.exe b/package/Resources/clientogl.exe
diff --git a/package/Resources/clientxna.exe b/package/Resources/clientxna.exe
diff --git a/package/updateconfig.ini → package/updateconfig.default.ini b/package/updateconfig.ini → package/updateconfig.default.ini
diff --git a/package/versionconfig.ini b/package/versionconfig.ini
@@ -34,7 +34,6 @@ Phobos.dll
 
 qres.dat
 qres32.dll
-updateconfig.ini
 
 ; Files (not directories) to be excluded from included files list.
 ; User-generated (settings etc), temporary and log files should be listed here.

diff --git a/tools/build-installer/inno/installer.twig b/tools/build-installer/inno/installer.twig
@@ -128,16 +128,6 @@ Root: HKCU; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\
 Root: HKCU64; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\gamemd-spawn.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE"; Check: IsWin64
 Root: HKLM64; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\gamemd-spawn.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE"; Check: IsWin64
 
-Root: HKLM; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\gamemd.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE RUNASADMIN"
-Root: HKCU; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\gamemd.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE RUNASADMIN"
-Root: HKCU64; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\gamemd.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE RUNASADMIN"; Check: IsWin64
-Root: HKLM64; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\gamemd.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE RUNASADMIN"; Check: IsWin64
-
-Root: HKLM; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\game.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE RUNASADMIN"
-Root: HKCU; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\game.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE RUNASADMIN"
-Root: HKCU64; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\game.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE RUNASADMIN"; Check: IsWin64
-Root: HKLM64; Subkey: Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers; ValueType: String; ValueName: {app}\game.exe; ValueData: "16BITCOLOR 8And16BitTimedPriSync HIGHDPIAWARE RUNASADMIN"; Check: IsWin64
-
 Root: HKCU; Subkey: Software\Wine\AppDefaults\gamemd-spawn.exe\DllOverrides; ValueType: string; ValueName: "ddraw"; ValueData: "native, builtin"; Check: RunsOnWine
 Root: HKCU; Subkey: Software\Wine\AppDefaults\gamemd-spawn.exe\DllOverrides; ValueType: string; ValueName: "wsock32"; ValueData: "native, builtin"; Check: RunsOnWine