Skip to content

Commit

Permalink
Update client binaries and configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
Starkku committed Dec 7, 2022
1 parent 6ce7db7 commit 820e937
Show file tree
Hide file tree
Showing 47 changed files with 700 additions and 192 deletions.
Binary file not shown.
Binary file removed ClientFiles/Resources/Binaries/DTAUpdater.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/ClientCore.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/ClientGUI.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/DTAConfig.dll
Binary file not shown.
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/OpenGL/Rampastring.XNAUI.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/ClientCore.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/ClientGUI.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/DTAConfig.dll
Binary file not shown.
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/Windows/Rampastring.XNAUI.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/ClientCore.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/ClientGUI.dll
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/DTAConfig.dll
Binary file not shown.
Binary file not shown.
Binary file modified ClientFiles/Resources/Binaries/XNA/Rampastring.XNAUI.dll
Binary file not shown.
12 changes: 12 additions & 0 deletions ClientFiles/Resources/CnCNetGameLobby.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[INISystem]
BasedOn=LANGameLobby.ini

[MultiplayerGameLobby]
$CCMP99=btnChangeTunnel:XNAClientButton

[btnChangeTunnel]
Text=Change Tunnel
$Width=BUTTON_WIDTH_133
$Height=DEFAULT_BUTTON_HEIGHT
$X=getX(btnLeaveGame) - getWidth($Self) - LOBBY_PANEL_SPACING
$Y=getY(btnLeaveGame)
3 changes: 1 addition & 2 deletions ClientFiles/Resources/GameOptions.ini
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,7 @@ Reversed=yes

[chkBrutalAI]
Text=Brutal AI
CustomIniPath=INI/Game Options/MultiEngineer.ini
SpawnIniOption=MultiEngineer
CustomIniPath=INI/Game Options/BrutalAI.ini
Checked=False
Location=1060,108
ToolTip=Makes the AI harder across all levels.
Expand Down
5 changes: 0 additions & 5 deletions ClientFiles/Resources/GenericWindow.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ BackgroundTexture=gamelobbybg.png
DrawBorders=true ;false
Size=1230,750

[MultiplayerGameLobby]
BackgroundTexture=gamelobbybg.png
DrawBorders=true ;false
Size=1230,750

[CnCNetLobby]
BackgroundTexture=cncnetlobbybg.png
DrawBorders=true ;false
Expand Down
25 changes: 25 additions & 0 deletions ClientFiles/Resources/GlobalThemeSettings.ini
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,28 @@ ToolTipOffsetY=-5
ToolTipMargin=4
ToolTipDelay=0.67
ToolTipAlphaRate=100.0 ;4.0

[ParserConstants]
DEFAULT_LBL_HEIGHT=12
DEFAULT_CONTROL_HEIGHT=21
DEFAULT_BUTTON_HEIGHT=23

BUTTON_WIDTH_133=133

OPEN_BUTTON_WIDTH=18
OPEN_BUTTON_HEIGHT=22 ;18

EMPTY_SPACE_TOP=12
EMPTY_SPACE_BOTTOM=12
EMPTY_SPACE_SIDES=12
BUTTON_SPACING=12
LABEL_SPACING=6
CHECKBOX_SPACING=24

LOBBY_EMPTY_SPACE_SIDES=12
LOBBY_PANEL_SPACING=10

GAME_OPTION_COLUMN_SPACING=160
GAME_OPTION_ROW_SPACING=6
GAME_OPTION_DD_WIDTH=132
GAME_OPTION_DD_HEIGHT=22
76 changes: 76 additions & 0 deletions ClientFiles/Resources/LANGameLobby.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
[INISystem]
BasedOn=SkirmishLobby.ini

[MultiplayerGameLobby]
$BaseSection=SkirmishLobby
PlayerReadyBoxY=2
PlayerReadyBoxX=6
PlayerOptionLocationX=29
PlayerOptionLocationY=25 ; def=24
PlayerOptionVerticalMargin=9 ; def=12
PlayerOptionHorizontalMargin=5 ; def=3
PlayerOptionCaptionLocationY=6 ; def=6
PlayerNameWidth=135 ; def=136
SideWidth=110 ; def=91
ColorWidth=80 ; def=79
StartWidth=45 ; def=49
TeamWidth=35 ; def=46

; controls
$CCMP00=btnLockGame:XNAClientButton
$CCMP01=chkAutoReady:XNAClientCheckBox

[lbMapList]
$Height=291

[btnPickRandomMap]
$Y=getBottom(lbMapList) + LOBBY_PANEL_SPACING

[tbMapSearch]
$X=getRight(btnPickRandomMap) + LOBBY_PANEL_SPACING
$Y=getY(btnPickRandomMap)

[lbChatMessagesBase]
SolidColorBackgroundTexture=0,0,0,128
$Width=getWidth(lbMapList)
$X=LOBBY_EMPTY_SPACE_SIDES

[lbChatMessages_Host]
$BaseSection=lbChatMessagesBase
$Y=getBottom(btnPickRandomMap) + LOBBY_PANEL_SPACING
$Height=getBottom(MapPreviewBox) - (getBottom(btnPickRandomMap) + LOBBY_PANEL_SPACING)

[lbChatMessages_Player]
$BaseSection=lbChatMessagesBase
$Y=EMPTY_SPACE_TOP
$Height=getBottom(MapPreviewBox) - (getY($Self)

[tbChatInputBase]
Suggestion=Type here to chat...
$Width=getWidth(lbMapList)
$Height=DEFAULT_CONTROL_HEIGHT
$X=LOBBY_EMPTY_SPACE_SIDES
$Y=getBottom(MapPreviewBox) + LOBBY_PANEL_SPACING

[tbChatInput_Host]
$BaseSection=tbChatInputBase

[tbChatInput_Player]
$BaseSection=tbChatInputBase

[btnLockGame]
$Width=BUTTON_WIDTH_133
$Height=DEFAULT_BUTTON_HEIGHT
$X=getRight(btnLaunchGame) + LOBBY_PANEL_SPACING
$Y=getY(btnLaunchGame)

[chkAutoReady]
Text=Auto-Ready
$X=getRight(btnLaunchGame) + LOBBY_PANEL_SPACING
$Y=getY(btnLaunchGame) + 2
Enabled=true
Visible=true

[cmbGameSpeedCap]
Items=Fastest (60 FPS),Faster (45 FPS),Fast (30 FPS),Medium (20 FPS),Slow (15 FPS),Slower (12 FPS),Slowest (10 FPS)

5 changes: 5 additions & 0 deletions ClientFiles/Resources/ManualUpdateQueryWindow.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[INISystem]
BasedOn=GenericWindow.ini

[btnClose]
Location=176,110
156 changes: 0 additions & 156 deletions ClientFiles/Resources/MultiplayerGameLobby.ini

This file was deleted.

62 changes: 60 additions & 2 deletions ClientFiles/Resources/OptionsWindow.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ BasedOn=GenericWindow.ini

[ExtraControls]

[DisplayOptionsPanelExtraControls]
0=chkMEDDraw:FileSettingCheckBox

[GameOptionsPanelExtraControls]
; Enable if using Phobos
;0=chkTooltipsExtra:SettingCheckBox
;1=chkPrioritySelection:SettingCheckBox
;2=chkBuildingPlacement:SettingCheckBox

[OptionsWindow]
DrawMode=Stretched
BackgroundTexture=optionsbg.png
Expand All @@ -21,11 +30,57 @@ BackgroundTexture=optionsbg.png

[ComponentsPanel]

[chkMEDDraw]
Location=285,114
Text=Enable DDWrapper for map editor
ToolTip=Enables DirectDraw wrapper & emulation for map editor.@Turning this option on can help if you are encountering problems with editor viewport not displaying or being laggy.
EnabledFile0=Resources/Compatibility/DLL/ddwrapper.dll,Map Editor/ddraw32.dll,OverwriteOnMismatch
EnabledFile1=Resources/Compatibility/Configs/aqrit.cfg,Map Editor/aqrit.cfg,KeepChanges
DefaultValue=false
SettingSection=Video
SettingKey=UseDDWrapperForMapEditor

[chkTooltipsExtra]
Location=24,151, ;12,151
Text=Sidebar Tooltip Descriptions
ToolTip=Enables additional information in sidebar tooltips.
DefaultValue=true
ParentCheckBoxName=chkTooltips
ParentCheckBoxRequiredValue=true
SettingSection=Phobos
SettingKey=ToolTipDescriptions

[chkPrioritySelection]
Location=242,54
Text=Mass Selection Filtering
ToolTip=If enabled, non-combat units are not selected if mass-selecting together with combat units.
DefaultValue=false
SettingSection=Phobos
SettingKey=PrioritySelectionFiltering

[chkBuildingPlacement]
Location=242,78
Text=Show Building Placement Preview
ToolTip=If enabled, shows a preview image of the building when placing it.
DefaultValue=false
SettingSection=Phobos
SettingKey=ShowBuildingPlacementPreview

[ddClientResolution]
PreferredItemLabel=(Rec.)
ToolTip=Resolutions marked with (Rec.) are recommended default resolutions.

[chkPingUnofficialTunnels]
[lblPlayerName]
Location=12,195

[tbPlayerName]
Location=113,193

[lblNotice]
Location=12,220

[btnConfigureHotkeys]
Location=12,290

[chkWriteInstallPathToRegistry]
Enabled=false
Expand Down Expand Up @@ -65,4 +120,7 @@ Location=276,138
Location=470,137

[gameListPanel]
Location=0,200
Location=0,200

[btnForceUpdate]

Loading

0 comments on commit 820e937

Please sign in to comment.