Skip to content

Commit c83a6ed

Browse files
authored
Merge branch 'develop' into feature/migration-to-dll-spawner+ares+phobos
2 parents 1998f8d + 92c1e86 commit c83a6ed

File tree

7 files changed

+39
-31
lines changed

7 files changed

+39
-31
lines changed

package/Resources/GameLobbyBase.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ Location=12,0
240240
DistanceFromBottomBorder=13
241241
Text=Launch Game
242242
Size=133,23
243+
ClickSoundEffect=button.wav
243244

244245
[btnLeaveGame]
245246
Text=Leave Game
@@ -389,7 +390,7 @@ $X=getX(chkDestrBridges)
389390
[chkBuildOffAlly]
390391
SpawnIniOption=BuildOffAlly
391392
Checked=True
392-
ToolTip=Check to allow players to build near their allies' buildings.
393+
ToolTip=Check to allow players to build near their allies' construction yards.
393394
Text=Build Off Ally ConYards
394395
$Y=getBottom(chkSuperWeapons) + GAME_OPTION_GAP
395396
$X=getX(chkDestrBridges)

package/Resources/Renderers.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ IsBorderlessWindowedModeKeyReversed=true
7373
UseQres=false
7474

7575
[CNC_DDRAW_V4460]
76-
; v4.46.0
76+
; v4.4.6.0
7777
UIName=CnC-DDraw (Legacy)
7878
DLLName=ddraw_v4.4.6.0.dll
7979
ConfigFileName=ddraw.ini

package/Resources/Translations/ru/Translation.ini

Lines changed: 30 additions & 26 deletions
Large diffs are not rendered by default.

package/Resources/cnc-ddraw-stretch.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ nonexclusive=true
120120

121121
; Force CPU0 affinity, avoids crashes/freezing, *might* have a performance impact
122122
; Note: Disable this if the game is not running smooth or there are sound issues
123-
singlecpu=true
123+
; Note (2025-05-06): bugged in 'true', better to use 'false'
124+
singlecpu=false
124125

125126
; Available display resolutions, possible values: 0 = Small list, 1 = Very small list, 2 = Full list
126127
; Note: Set this to 2 if your chosen resolution is not working or does not show up in the list

package/Resources/cnc-ddraw.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ nonexclusive=true
120120

121121
; Force CPU0 affinity, avoids crashes/freezing, *might* have a performance impact
122122
; Note: Disable this if the game is not running smooth or there are sound issues
123-
singlecpu=true
123+
; Note (2025-05-06): bugged in 'true', better to use 'false'
124+
singlecpu=false
124125

125126
; Available display resolutions, possible values: 0 = Small list, 1 = Very small list, 2 = Full list
126127
; Note: Set this to 2 if your chosen resolution is not working or does not show up in the list

package/Resources/cnc-ddraw_v4.4.6.0.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ nonexclusive=false
104104
fixpitch=false
105105

106106
; Force CPU0 affinity, avoids crashes/freezing, *might* have a performance impact
107-
singlecpu=true
107+
; Note (2025-05-06): bugged in 'true', better to use 'false'
108+
singlecpu=false
108109

109110
; Available resolutions, possible values: 0 = Small list, 1 = Very small list, 2 = Full list
110111
; Note: Set this to 2 if your chosen resolution is not working, set to 1 if the game is crashing

package/Resources/ddrawcompat.dll

112 KB
Binary file not shown.

0 commit comments

Comments
 (0)