Overhaul the server browser.

This commit is contained in:
Paul Chote
2015-10-22 22:59:52 +01:00
parent 2a210a7314
commit c0f42904f0
38 changed files with 1272 additions and 894 deletions

View File

@@ -449,6 +449,8 @@ lobby-bits: chrome.png
colorpicker: 257,33,14,14
huepicker: 388,96,7,15
kick: 386,115,11,11
protected: 403,97,10,13
protected-disabled: 403,113,10,13
checkbox-bits: chrome.png
checked: 272,32,16,16

View File

@@ -1,135 +0,0 @@
Container@CREATESERVER_PANEL:
Logic: ServerCreationLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - 260)/2
Width: 521
Height: 250
Children:
Label@TITLE:
Text: Create Server
Width: PARENT_RIGHT
Y: 0-25
Font: BigBold
Contrast: true
Align: Center
Background@bg:
Width: PARENT_RIGHT
Height: 215
Background: panel-black
Children:
Background@MAP_BG:
X: PARENT_RIGHT-WIDTH-15
Y: 15
Width: 162
Height: 162
Background: panel-gray
Children:
MapPreview@MAP_PREVIEW:
X: 1
Y: 1
Width: 160
Height: 160
Label@MAP_NAME:
X: PARENT_RIGHT-WIDTH-15
Y: PARENT_BOTTOM - 33
Width: 162
Height: 25
Align: Center
Font: Bold
Label@SERVER_NAME_LABEL:
X: 15
Y: 14
Width: 90
Height: 25
Align: Right
Text: Server Name:
TextField@SERVER_NAME:
X: 110
Y: 15
Width: 215
MaxLength: 50
Height: 25
Text: My OpenRA Server
Label@PASSWORD_LABEL:
X: 10
Y: 49
Width: 95
Height: 25
Align: Right
Text: Password:
PasswordField@PASSWORD:
X: 110
Y: 50
Width: 145
MaxLength: 20
Height: 25
Label@AFTER_PASSWORD_LABEL:
X: 265
Y: 49
Width: 95
Height: 25
Align: Left
Text: (optional)
Label@LISTEN_PORT_LABEL:
X: 15
Y: 84
Width: 90
Height: 25
Align: Right
Text: Port:
TextField@LISTEN_PORT:
X: 110
Y: 85
Width: 50
MaxLength: 5
Height: 25
Text: 1234
Label@EXTERNAL_PORT_LABEL:
X: 180
Y: 84
Width: 90
Height: 25
Align: Right
Text: External Port:
TextField@EXTERNAL_PORT:
X: 275
Y: 85
Width: 50
MaxLength: 5
Height: 25
Text: 1234
Checkbox@ADVERTISE_CHECKBOX:
X: 110
Y: 135
Width: 150
Height: 20
Font: Regular
Text: Advertise Online
Checkbox@UPNP_CHECKBOX:
X: 110
Y: 165
Width: 300
Height: 20
Font: Regular
Text: Automatic port forwarding
Button@BACK_BUTTON:
Key: escape
X: 0
Y: 214
Width: 140
Height: 35
Text: Back
Button@MAP_BUTTON:
X: 231
Y: 214
Width: 140
Height: 35
Text: Choose Map
Button@CREATE_BUTTON:
Key: return
X: 381
Y: 214
Width: 140
Height: 35
Text: Create

View File

@@ -1,58 +0,0 @@
Container@DIRECTCONNECT_PANEL:
Logic: DirectConnectLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - 90)/2
Width: 370
Height: 130
Children:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0-25
Font: BigBold
Contrast: true
Align: Center
Text: Connect to Server
Background@bg:
Width: 370
Height: 95
Background: panel-black
Children:
Label@ADDRESS_LABEL:
X: 50
Y: 14
Width: 95
Height: 25
Align: Right
Text: Address:
TextField@IP:
X: 150
Y: 15
Width: 200
Height: 25
Label@PORT_LABEL:
X: 50
Y: 49
Width: 95
Height: 25
Align: Right
Text: Port:
TextField@PORT:
X: 150
Y: 50
Width: 200
Height: 25
Button@BACK_BUTTON:
Key: escape
X: 0
Y: 94
Width: 140
Height: 35
Text: Back
Button@JOIN_BUTTON:
Key: return
X: 230
Y: 94
Width: 140
Height: 35
Text: Join

View File

@@ -20,8 +20,8 @@ Container@LOBBY_GLOBALCHAT_PANEL:
Font: TinyBold
Align: Center
ScrollPanel@HISTORY_PANEL:
Width: 582
Y: 19
Width: 582
Height: PARENT_BOTTOM - 19
ItemSpacing: 5
Children:

View File

@@ -0,0 +1,140 @@
Container@MULTIPLAYER_BROWSER_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Container@LABEL_CONTAINER:
Y: 5
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@NAME:
X: 5
Width: 255
Height: 25
Text: Server
Align: Center
Font: Bold
Label@PLAYERS:
X: 290
Width: 85
Height: 25
Text: Players
Font: Bold
Label@LOCATION:
X: 380
Width: 120
Height: 25
Text: Country
Font: Bold
Label@STATUS:
X: 495
Width: 50
Height: 25
Text: Status
Font: Bold
ScrollPanel@SERVER_LIST:
Y: 30
Width: 582
Height: 249
TopBottomSpacing: 2
Children:
ScrollItem@HEADER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 20
X: 2
Visible: false
Children:
Label@LABEL:
Y: 0-1
Font: TinyBold
Width: PARENT_RIGHT
Height: 20
Align: Center
ScrollItem@SERVER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 25
X: 2
Children:
Label@TITLE:
X: 5
Width: 255
Height: 25
Image@PASSWORD_PROTECTED:
X: 272
Y: 6
Width: 8
Height: 10
ImageCollection: lobby-bits
Label@PLAYERS:
X: 290
Width: 85
Height: 25
Label@LOCATION:
X: 380
Width: 120
Height: 25
Label@STATUS:
X: 495
Width: 50
Height: 25
Label@PROGRESS_LABEL:
Y: 30 + (249 - HEIGHT) / 2
Width: 582
Height: 25
Font: Bold
Align: Center
Visible: false
Container@SELECTED_SERVER:
X: PARENT_RIGHT-WIDTH
Y: 30
Width: 174
Height: 280
Children:
Background@MAP_BG:
Width: PARENT_RIGHT
Height: 174
Background: panel-gray
Children:
MapPreview@SELECTED_MAP_PREVIEW:
X: 1
Y: 1
Width: PARENT_RIGHT-2
Height: PARENT_BOTTOM-2
TooltipContainer: TOOLTIP_CONTAINER
Label@SELECTED_MAP:
Y: 172
Width: PARENT_RIGHT
Height: 25
Font: Bold
Align: Center
Label@SELECTED_IP:
Y: 187
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Label@SELECTED_STATUS:
Y: 203
Width: PARENT_RIGHT
Height: 25
Font: TinyBold
Align: Center
Label@SELECTED_MOD_VERSION:
Y: 216
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Label@SELECTED_PLAYERS:
Y: 229
Width: PARENT_RIGHT
Height: 25
Font: TinyBold
Align: Center
Button@JOIN_BUTTON:
Key: return
X: PARENT_RIGHT - WIDTH
Y: 284
Width: 174
Height: 25
Text: Join

View File

@@ -0,0 +1,129 @@
Container@MULTIPLAYER_CREATESERVER_PANEL:
Logic: ServerCreationLogic
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@TITLE:
Y: 5
Width: 582
Height: 25
Text: Create Server
Align: Center
Font: Bold
ScrollPanel:
Y: 30
Width: 582
Height: 249
Children:
Container:
X: 185
Y: 25
Children:
Label@SERVER_NAME_LABEL:
Y: 14
Width: 95
Height: 25
Align: Right
Text: Server Name:
TextField@SERVER_NAME:
X: 100
Y: 15
Width: 215
MaxLength: 50
Height: 25
Text: My OpenRA Server
Label@PASSWORD_LABEL:
Y: 49
Width: 95
Height: 25
Align: Right
Text: Password:
PasswordField@PASSWORD:
X: 100
Y: 50
Width: 145
MaxLength: 20
Height: 25
Label@AFTER_PASSWORD_LABEL:
X: 255
Y: 49
Width: 95
Height: 25
Align: Left
Text: (optional)
Label@LISTEN_PORT_LABEL:
Y: 84
Width: 95
Height: 25
Align: Right
Text: Port:
TextField@LISTEN_PORT:
X: 100
Y: 85
Width: 50
Height: 25
MaxLength: 5
Text: 1234
Label@EXTERNAL_PORT_LABEL:
X: 170
Y: 84
Width: 90
Height: 25
Align: Right
Text: External Port:
TextField@EXTERNAL_PORT:
X: 265
Y: 85
Width: 50
MaxLength: 5
Height: 25
Text: 1234
Checkbox@ADVERTISE_CHECKBOX:
X: 100
Y: 135
Width: 150
Height: 20
Font: Regular
Text: Advertise Online
Checkbox@UPNP_CHECKBOX:
X: 100
Y: 165
Width: 300
Height: 20
Font: Regular
Text: Automatic port forwarding
Container@SIDEBAR:
X: PARENT_RIGHT-WIDTH
Y: 30
Width: 174
Height: 280
Children:
Background@MAP_BG:
Width: PARENT_RIGHT
Height: 174
Background: panel-gray
Children:
MapPreview@MAP_PREVIEW:
X: 1
Y: 1
Width: PARENT_RIGHT - 2
Height: PARENT_RIGHT - 2
Label@MAP_NAME:
Y: 172
Width: PARENT_RIGHT
Height: 25
Font: Bold
Align: Center
Button@MAP_BUTTON:
X: PARENT_RIGHT - WIDTH
Y: 284-30
Width: 174
Height: 25
Text: Choose Map
Button@CREATE_BUTTON:
Key: return
X: PARENT_RIGHT - WIDTH
Y: 284
Width: 174
Height: 25
Text: Create

View File

@@ -0,0 +1,95 @@
Container@MULTIPLAYER_DIRECTCONNECT_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@TITLE:
Y: 5
Width: 582
Height: 25
Text: Connect to Server
Align: Center
Font: Bold
ScrollPanel:
Y: 30
Width: 582
Height: 249
Children:
Container:
X: 185
Y: 60
Children:
Label@ADDRESS_LABEL:
Y: 14
Width: 95
Height: 25
Align: Right
Text: Address:
TextField@IP:
X: 100
Y: 15
Width: 215
Height: 25
Label@PORT_LABEL:
Y: 49
Width: 95
Height: 25
Align: Right
Text: Port:
TextField@PORT:
X: 100
Y: 50
Width: 50
Height: 25
MaxLength: 5
Container@SIDEBAR:
X: PARENT_RIGHT-WIDTH
Y: 30
Width: 174
Height: 280
Children:
Background@MAP_BG:
Width: PARENT_RIGHT
Height: 174
Background: panel-gray
Label@TITLE:
Y: 172
Width: PARENT_RIGHT
Height: 25
Font: Bold
Align: Center
Text: Direct Connect
Label@DESCA:
Y: 190
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Text: Enter the server IP and port in the
Label@DESCB:
Y: 203
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Text: fields to the left, and then press Join.
Label@DESCC:
Y: 216
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Text: The mod and game version will be
Label@DESCD:
Y: 229
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Text: verified when connecting.
Button@JOIN_BUTTON:
Key: return
X: PARENT_RIGHT - WIDTH
Y: 284
Width: 174
Height: 25
Text: Join

View File

@@ -8,7 +8,7 @@ Container@GLOBALCHAT_PANEL:
Height: PARENT_BOTTOM
Children:
Background@TOPIC:
Width: 565
Width: 582
Height: 20
Background: panel-transparent
Children:
@@ -20,8 +20,8 @@ Container@GLOBALCHAT_PANEL:
Font: TinyBold
Align: Center
ScrollPanel@HISTORY_PANEL:
Width: 565
Y: 19
Width: 582
Height: PARENT_BOTTOM - 49
ItemSpacing: 5
Children:
@@ -32,11 +32,19 @@ Container@GLOBALCHAT_PANEL:
WordWrap: True
TextField@CHAT_TEXTFIELD:
Y: PARENT_BOTTOM - 25
Width: 565
Width: 582
Height: 25
LeftMargin: 60
Children:
Label@LABEL_CHATTYPE:
Y: 0-1
Width: 55
Height: 25
Align: Right
Text: Global:
ScrollPanel@NICKNAME_PANEL:
X: 570
Width: 130
X: PARENT_RIGHT-WIDTH
Width: 174
Height: PARENT_BOTTOM - 30
Children:
Container@NICKNAME_TEMPLATE:
@@ -53,11 +61,11 @@ Container@GLOBALCHAT_PANEL:
Width: PARENT_RIGHT-15
Height: 20
Button@DISCONNECT_BUTTON:
X: 570
X: PARENT_RIGHT-WIDTH
Y: PARENT_BOTTOM - 25
Width: 130
Width: 174
Height: 25
Text: Disconnect
Text: Leave Chat
Font: Bold
Background@GLOBALCHAT_CONNECT_PANEL:
Width: PARENT_RIGHT

View File

@@ -0,0 +1,111 @@
Container@MULTIPLAYER_PANEL:
Logic: MultiplayerLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - 560)/2
Width: 800
Height: 575
Children:
Label@TITLE:
Text: Multiplayer
Width: PARENT_RIGHT
Y: 0-25
Font: BigBold
Contrast: true
Align: Center
Background@bg:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM - 35
Background: panel-black
Children:
DropDownButton@FILTERS_DROPDOWNBUTTON:
X: 15
Y: 284
Width: 147
Height: 25
Text: Filter Games
Button@REFRESH_BUTTON:
X: 167
Y: 284
Width: 100
Height: 25
Text: Refresh
Button@BROWSER_TAB:
X: 272
Y: 278
Width: 105
Height: 31
Text: Browse
Button@DIRECTCONNECT_TAB:
X: 382
Y: 278
Width: 105
Height: 31
Text: Direct IP
Button@CREATE_TAB:
X: 492
Y: 278
Width: 105
Height: 31
Text: Create
Container@TOP_PANELS_ROOT:
X: 15
Width: PARENT_RIGHT - 30
Height: PARENT_BOTTOM
Container@GLOBALCHAT_ROOT:
X: 15
Y: 315
Width: PARENT_RIGHT - 30
Height: PARENT_BOTTOM - 330
TooltipContainer@TOOLTIP_CONTAINER:
Button@BACK_BUTTON:
Key: escape
X: 0
Y: PARENT_BOTTOM - 36
Width: 140
Height: 35
Text: Back
ScrollPanel@MULTIPLAYER_FILTER_PANEL:
Width: 147
Height: 130
Background: panel-black
Children:
Checkbox@WAITING_FOR_PLAYERS:
X: 5
Y: 5
Width: 137
Height: 20
Text: Waiting
TextColor: 50,205,50
Font: Regular
Checkbox@EMPTY:
X: 5
Y: 30
Width: 137
Height: 20
Text: Empty
Font: Regular
Checkbox@PASSWORD_PROTECTED:
X: 5
Y: 55
Width: 137
Height: 20
Text: Protected
TextColor: 255,0,0
Font: Regular
Checkbox@ALREADY_STARTED:
X: 5
Y: 80
Width: 137
Height: 20
Text: Started
TextColor: 255,165,0
Font: Regular
Checkbox@INCOMPATIBLE_VERSION:
X: 5
Y: 105
Width: 137
Height: 20
Text: Incompatible
TextColor: 190,190,190
Font: Regular

View File

@@ -1,170 +0,0 @@
Container@SERVERBROWSER_PANEL:
Logic: ServerBrowserLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 730
Height: 595
Children:
Label@TITLE:
Text: Multiplayer
Width: 740
Y: 0-10
Font: BigBold
Contrast: true
Align: Center
Background@bg:
Width: 730
Height: PARENT_BOTTOM - 30
Background: panel-black
Y: 15
Children:
Container@GLOBALCHAT_ROOT:
X: 15
Y: 15
Width: 700
Height: 260
ScrollPanel@SERVER_LIST:
X: 15
Y: 280
Width: 700
Height: 240
Children:
ScrollItem@HEADER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 25
X: 2
Visible: false
Children:
Label@LABEL:
Y: 0-1
Font: Bold
Width: PARENT_RIGHT
Height: 25
Align: Center
ScrollItem@SERVER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 68
X: 2
Y: 0
Children:
MapPreview@MAP_PREVIEW:
X: 2
Y: 2
Width: 64
Height: 64
ShowSpawnPoints: no
Label@TITLE:
X: 70
Width: 200
Height: 25
Font: Bold
Label@MAP:
X: 70
Y: 20
Width: 250
Height: 25
Label@PLAYERS:
X: 70
Y: 40
Width: 50
Height: 25
Label@STATE:
Width: 140
X: PARENT_RIGHT-150
Align: Right
Height: 25
Font: Bold
Label@IP:
Width: 140
X: PARENT_RIGHT-150
Y: 20
Align: Right
Height: 25
Label@LOCATION:
Width: 140
X: PARENT_RIGHT-150
Y: 40
Align: Right
Height: 25
Label@PROGRESS_LABEL:
X: (PARENT_RIGHT - WIDTH) / 2
Y: PARENT_BOTTOM / 2 - HEIGHT + (280 / 2)
Width: 710
Height: 25
Font: Bold
Align: Center
Visible: false
Label@SHOW_LABEL_TITLE:
X: 20
Y: 525
Width: 20
Height: 25
Text: Show:
Font: Bold
Checkbox@WAITING_FOR_PLAYERS:
X: 80
Y: 527
Width: 100
Height: 20
Text: Waiting
TextColor: 50,205,50
Checkbox@EMPTY:
X: 180
Y: 527
Width: 100
Height: 20
Text: Empty
Checkbox@PASSWORD_PROTECTED:
X: 270
Y: 527
Width: 100
Height: 20
Text: Protected
TextColor: 255,0,0
Checkbox@ALREADY_STARTED:
X: 385
Y: 527
Width: 100
Height: 20
Text: Started
TextColor: 255,165,0
Checkbox@INCOMPATIBLE_VERSION:
X: 480
Y: 527
Width: 100
Height: 20
Text: Incompatible
TextColor: 190,190,190
Button@REFRESH_BUTTON:
X: PARENT_RIGHT - WIDTH - 15
Y: 525
Width: 100
Height: 25
Text: Refresh
Button@BACK_BUTTON:
Key: escape
X: 0
Y: PARENT_BOTTOM - 16
Width: 140
Height: 35
Text: Back
Button@CREATE_BUTTON:
X: PARENT_RIGHT - 140 - 10 - 140 - 10 - 140
Y: PARENT_BOTTOM - 16
Width: 140
Height: 35
Text: Create
Button@DIRECTCONNECT_BUTTON:
X: PARENT_RIGHT - 140 - 10 - 140
Y: PARENT_BOTTOM - 16
Width: 140
Height: 35
Text: Direct IP
Button@JOIN_BUTTON:
Key: return
X: PARENT_RIGHT - 140
Y: PARENT_BOTTOM - 16
Width: 140
Height: 35
Text: Join

View File

@@ -26,8 +26,8 @@ Metrics:
SpawnColor: 255,255,255
SpawnContrastColor: 0,0,0
SpawnLabelOffset: 0,1
IncompatibleVersionColor: 255,0,0
IncompatibleGameColor: 169,169,169
CantJoinGameColor: 211,211,211
ProtectedGameColor: 255,0,0
IncompatibleProtectedGameColor: 139,0,0
WaitingGameColor: 0,255,0

View File

@@ -91,9 +91,11 @@ Assemblies:
ChromeLayout:
./mods/cnc/chrome/mainmenu.yaml
./mods/cnc/chrome/serverbrowser.yaml
./mods/cnc/chrome/createserver.yaml
./mods/cnc/chrome/directconnect.yaml
./mods/cnc/chrome/multiplayer.yaml
./mods/cnc/chrome/multiplayer-browser.yaml
./mods/cnc/chrome/multiplayer-createserver.yaml
./mods/cnc/chrome/multiplayer-directconnect.yaml
./mods/cnc/chrome/multiplayer-globalchat.yaml
./mods/cnc/chrome/lobby.yaml
./mods/cnc/chrome/lobby-mappreview.yaml
./mods/cnc/chrome/lobby-players.yaml
@@ -123,7 +125,6 @@ ChromeLayout:
./mods/cnc/chrome/assetbrowser.yaml
./mods/cnc/chrome/missionbrowser.yaml
./mods/cnc/chrome/editor.yaml
./mods/cnc/chrome/globalchat.yaml
Voices:
./mods/cnc/audio/voices.yaml

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 79 KiB

View File

@@ -155,6 +155,8 @@ lobby-bits: spawnpoints.png
admin: 64,5,7,5
colorpicker: 5,5,22,22
huepicker: 71,0,7,15
protected: 79,0,10,13
protected-disabled: 90,0,10,13
strategic: strategic.png
unowned: 0,0,32,32

View File

@@ -26,8 +26,8 @@ Metrics:
SpawnColor: 255,255,255
SpawnContrastColor: 0,0,0
SpawnLabelOffset: 0,1
IncompatibleVersionColor: 255,0,0
IncompatibleGameColor: 169,169,169
CantJoinGameColor: 211,211,211
ProtectedGameColor: 255,0,0
IncompatibleProtectedGameColor: 139,0,0
WaitingGameColor: 0,255,0

View File

@@ -93,11 +93,12 @@ ChromeLayout:
./mods/ra/chrome/lobby-globalchat.yaml
./mods/d2k/chrome/color-picker.yaml
./mods/ra/chrome/map-chooser.yaml
./mods/ra/chrome/create-server.yaml
./mods/ra/chrome/serverbrowser.yaml
./mods/ra/chrome/multiplayer.yaml
./mods/ra/chrome/multiplayer-browser.yaml
./mods/ra/chrome/multiplayer-createserver.yaml
./mods/ra/chrome/multiplayer-directconnect.yaml
./mods/ra/chrome/multiplayer-globalchat.yaml
./mods/ra/chrome/connection.yaml
./mods/ra/chrome/directconnect.yaml
./mods/ra/chrome/replaybrowser.yaml
./mods/d2k/chrome/dropdowns.yaml
./mods/ra/chrome/musicplayer.yaml
./mods/d2k/chrome/tooltips.yaml
@@ -105,7 +106,6 @@ ChromeLayout:
./mods/d2k/chrome/missionbrowser.yaml
./mods/ra/chrome/confirmation-dialogs.yaml
./mods/ra/chrome/editor.yaml
./mods/ra/chrome/globalchat.yaml
Weapons:
./mods/d2k/weapons.yaml

View File

@@ -461,6 +461,8 @@ lobby-bits: spawnpoints.png
admin: 64,5,7,5
colorpicker: 5,5,22,22
huepicker: 71,0,7,15
protected: 79,0,10,13
protected-disabled: 90,0,10,13
strategic: strategic.png
unowned: 0,0,32,32

View File

@@ -1,105 +0,0 @@
Background@CREATESERVER_PANEL:
Logic: ServerCreationLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 400
Height: 300
Children:
Label@LABEL_TITLE:
X: 0
Y: 20
Width: 400
Height: 25
Text: Create Server
Align: Center
Font: Bold
Label@SERVER_NAME_LABEL:
X: 50
Y: 59
Width: 95
Height: 25
Align: Right
Text: Game Title:
TextField@SERVER_NAME:
X: 150
Y: 60
Width: 210
MaxLength: 50
Height: 25
Text: OpenRA Game
Label@PASSWORD_LABEL:
X: 50
Y: 94
Width: 95
Height: 25
Align: Right
Text: Password:
PasswordField@PASSWORD:
X: 150
Y: 95
Width: 145
MaxLength: 20
Height: 25
Label@AFTER_PASSWORD_LABEL:
X: 300
Y: 94
Width: 95
Height: 25
Align: Left
Text: (optional)
Label@EXTERNAL_PORT_LABEL:
X: 50
Y: 129
Width: 95
Height: 25
Align: Right
Text: External Port:
TextField@EXTERNAL_PORT:
X: 150
Y: 130
Width: 50
MaxLength: 5
Height: 25
Text: OpenRA Game
Label@LISTEN_PORT_LABEL:
X: 210
Y: 129
Width: 95
Height: 25
Align: Right
Text: Listen Port:
TextField@LISTEN_PORT:
X: 310
Y: 130
Width: 50
MaxLength: 5
Height: 25
Checkbox@UPNP_CHECKBOX:
X: 150
Y: 165
Width: 300
Height: 20
Text: Automatic port forwarding
Checkbox@ADVERTISE_CHECKBOX:
X: 150
Y: 200
Width: 300
Height: 20
Text: Advertise game Online
Button@CREATE_BUTTON:
X: 130
Y: PARENT_BOTTOM - 45
Width: 120
Height: 25
Text: Create
Font: Bold
Key: return
Button@BACK_BUTTON:
X: 260
Y: PARENT_BOTTOM - 45
Width: 120
Height: 25
Text: Cancel
Font: Bold
Key: escape

View File

@@ -1,51 +0,0 @@
Background@DIRECTCONNECT_PANEL:
Logic: DirectConnectLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 400
Height: 150
Children:
Label@DIRECTCONNECT_LABEL_TITLE:
X: 0
Y: 20
Width: 400
Height: 25
Text: Connect to Server
Align: Center
Font: Bold
Label@ADDRESS_LABEL:
X: 50
Y: 59
Width: 95
Height: 25
Align: Right
Text: Server Address:
TextField@IP:
X: 150
Y: 60
Width: 160
MaxLength: 50
Height: 25
TextField@PORT:
X: 315
Y: 60
Width: 55
MaxLength: 5
Height: 25
Button@JOIN_BUTTON:
X: 130
Y: PARENT_BOTTOM - 45
Width: 120
Height: 25
Text: Join
Font: Bold
Key: return
Button@BACK_BUTTON:
X: 260
Y: PARENT_BOTTOM - 45
Width: 120
Height: 25
Text: Cancel
Font: Bold
Key: escape

View File

@@ -49,8 +49,8 @@ Container@LOBBY_GLOBALCHAT_PANEL:
Height: PARENT_BOTTOM - 30
Children:
Container@NICKNAME_TEMPLATE:
Height: 20
Width: PARENT_RIGHT-25
Height: 20
Children:
Image@INDICATOR:
ImageCollection: lobby-bits

View File

@@ -7,11 +7,10 @@ Background@SERVER_LOBBY:
Children:
ColorPreviewManager@COLOR_MANAGER:
Label@SERVER_NAME:
X: 0
Y: 15
Align: Center
Width: PARENT_RIGHT
Height: 20
Height: 25
Font: Bold
Container@MAP_PREVIEW_ROOT:
X: PARENT_RIGHT-20-WIDTH
@@ -85,9 +84,9 @@ Background@SERVER_LOBBY:
ItemSpacing: 2
Children:
Container@CHAT_TEMPLATE:
X: 2
Width: PARENT_RIGHT-27
Height: 16
X: 2
Children:
Label@TIME:
X: 3

View File

@@ -0,0 +1,142 @@
Container@MULTIPLAYER_BROWSER_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Container@LABEL_CONTAINER:
Y: 5
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@NAME:
X: 5
Width: 255
Height: 25
Text: Server
Align: Center
Font: Bold
Label@PLAYERS:
X: 290
Width: 85
Height: 25
Text: Players
Font: Bold
Label@LOCATION:
X: 380
Width: 120
Height: 25
Text: Country
Font: Bold
Label@STATUS:
X: 495
Width: 50
Height: 25
Text: Status
Font: Bold
ScrollPanel@SERVER_LIST:
Y: 30
Width: 583
Height: 249
TopBottomSpacing: 2
Children:
ScrollItem@HEADER_TEMPLATE:
X: 2
Width: PARENT_RIGHT-27
Height: 20
BaseName: scrollheader
Visible: false
Children:
Label@LABEL:
Y: 0-1
Font: TinyBold
Width: PARENT_RIGHT
Height: 20
Align: Center
ScrollItem@SERVER_TEMPLATE:
X: 2
Width: PARENT_RIGHT-27
Height: 25
Children:
Label@TITLE:
X: 5
Width: 255
Height: 25
Image@PASSWORD_PROTECTED:
X: 272
Y: 6
Width: 8
Height: 10
ImageCollection: lobby-bits
Label@PLAYERS:
X: 290
Width: 85
Height: 25
Label@LOCATION:
X: 380
Width: 120
Height: 25
Label@STATUS:
X: 495
Width: 50
Height: 25
Label@PROGRESS_LABEL:
Y: 30 + (249 - HEIGHT) / 2
Width: 582
Height: 25
Font: Bold
Align: Center
Visible: false
Container@SELECTED_SERVER:
X: PARENT_RIGHT-WIDTH
Y: 30
Width: 174
Height: 280
Children:
Background@MAP_BG:
Width: PARENT_RIGHT
Height: 174
Background: dialog3
Children:
MapPreview@SELECTED_MAP_PREVIEW:
X: 1
Y: 1
Width: PARENT_RIGHT-2
Height: PARENT_BOTTOM-2
TooltipContainer: TOOLTIP_CONTAINER
Label@SELECTED_MAP:
Y: 172
Width: PARENT_RIGHT
Height: 25
Font: Bold
Align: Center
Label@SELECTED_IP:
Y: 187
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Label@SELECTED_STATUS:
Y: 203
Width: PARENT_RIGHT
Height: 25
Font: TinyBold
Align: Center
Label@SELECTED_MOD_VERSION:
Y: 216
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Label@SELECTED_PLAYERS:
Y: 229
Width: PARENT_RIGHT
Height: 25
Font: TinyBold
Align: Center
Button@JOIN_BUTTON:
Key: return
X: PARENT_RIGHT - WIDTH
Y: 284
Width: 174
Height: 25
Text: Join
Font: Bold

View File

@@ -0,0 +1,131 @@
Container@MULTIPLAYER_CREATESERVER_PANEL:
Logic: ServerCreationLogic
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@TITLE:
Y: 5
Width: 582
Height: 25
Text: Create Server
Align: Center
Font: Bold
ScrollPanel:
Y: 30
Width: 583
Height: 249
Children:
Container:
X: 185
Y: 25
Children:
Label@SERVER_NAME_LABEL:
Y: 14
Width: 95
Height: 25
Align: Right
Text: Server Name:
TextField@SERVER_NAME:
X: 100
Y: 15
Width: 215
MaxLength: 50
Height: 25
Text: My OpenRA Server
Label@PASSWORD_LABEL:
Y: 49
Width: 95
Height: 25
Align: Right
Text: Password:
PasswordField@PASSWORD:
X: 100
Y: 50
Width: 145
MaxLength: 20
Height: 25
Label@AFTER_PASSWORD_LABEL:
X: 255
Y: 49
Width: 95
Height: 25
Align: Left
Text: (optional)
Label@LISTEN_PORT_LABEL:
Y: 84
Width: 95
Height: 25
Align: Right
Text: Port:
TextField@LISTEN_PORT:
X: 100
Y: 85
Width: 50
Height: 25
MaxLength: 5
Text: 1234
Label@EXTERNAL_PORT_LABEL:
X: 170
Y: 84
Width: 90
Height: 25
Align: Right
Text: External Port:
TextField@EXTERNAL_PORT:
X: 265
Y: 85
Width: 50
MaxLength: 5
Height: 25
Text: 1234
Checkbox@ADVERTISE_CHECKBOX:
X: 100
Y: 135
Width: 150
Height: 20
Font: Regular
Text: Advertise Online
Checkbox@UPNP_CHECKBOX:
X: 100
Y: 165
Width: 300
Height: 20
Font: Regular
Text: Automatic port forwarding
Container@SIDEBAR:
X: PARENT_RIGHT-WIDTH
Y: 30
Width: 174
Height: 280
Children:
Background@MAP_BG:
Width: PARENT_RIGHT
Height: 174
Background: dialog3
Children:
MapPreview@MAP_PREVIEW:
X: 1
Y: 1
Width: PARENT_RIGHT - 2
Height: PARENT_RIGHT - 2
Label@MAP_NAME:
Y: 172
Width: PARENT_RIGHT
Height: 25
Font: Bold
Align: Center
Button@MAP_BUTTON:
X: PARENT_RIGHT - WIDTH
Y: 284-30
Width: 174
Height: 25
Text: Choose Map
Font: Bold
Button@CREATE_BUTTON:
Key: return
X: PARENT_RIGHT - WIDTH
Y: 284
Width: 174
Height: 25
Text: Create
Font: Bold

View File

@@ -0,0 +1,96 @@
Container@MULTIPLAYER_DIRECTCONNECT_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Label@TITLE:
Y: 5
Width: 583
Height: 25
Text: Connect to Server
Align: Center
Font: Bold
ScrollPanel:
Y: 30
Width: 583
Height: 249
Children:
Container:
X: 185
Y: 60
Children:
Label@ADDRESS_LABEL:
Y: 14
Width: 95
Height: 25
Align: Right
Text: Address:
TextField@IP:
X: 100
Y: 15
Width: 215
Height: 25
Label@PORT_LABEL:
Y: 49
Width: 95
Height: 25
Align: Right
Text: Port:
TextField@PORT:
X: 100
Y: 50
Width: 50
Height: 25
MaxLength: 5
Container@SIDEBAR:
X: PARENT_RIGHT-WIDTH
Y: 30
Width: 174
Height: 280
Children:
Background@MAP_BG:
Width: PARENT_RIGHT
Height: 174
Background: dialog3
Label@TITLE:
Y: 172
Width: PARENT_RIGHT
Height: 25
Font: Bold
Align: Center
Text: Direct Connect
Label@DESCA:
Y: 190
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Text: Enter the server IP and port in the
Label@DESCB:
Y: 203
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Text: fields to the left, and then press Join.
Label@DESCC:
Y: 216
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Text: The mod and game version will be
Label@DESCD:
Y: 229
Width: PARENT_RIGHT
Height: 25
Font: Tiny
Align: Center
Text: verified when connecting.
Button@JOIN_BUTTON:
Key: return
X: PARENT_RIGHT - WIDTH
Y: 284
Width: 174
Height: 25
Text: Join
Font: Bold

View File

@@ -8,7 +8,7 @@ Container@GLOBALCHAT_PANEL:
Height: PARENT_BOTTOM
Children:
Background@TOPIC:
Width: 565
Width: 582
Height: 20
Background: dialog2
Children:
@@ -21,7 +21,7 @@ Container@GLOBALCHAT_PANEL:
Align: Center
ScrollPanel@HISTORY_PANEL:
Y: 20
Width: 565
Width: 582
Height: PARENT_BOTTOM - 50
ItemSpacing: 5
Children:
@@ -32,11 +32,19 @@ Container@GLOBALCHAT_PANEL:
WordWrap: True
TextField@CHAT_TEXTFIELD:
Y: PARENT_BOTTOM - 25
Width: 565
Width: 582
Height: 25
LeftMargin: 60
Children:
Label@LABEL_CHATTYPE:
Y: 0-1
Width: 55
Height: 25
Align: Right
Text: Global:
ScrollPanel@NICKNAME_PANEL:
X: 570
Width: 130
X: PARENT_RIGHT-WIDTH
Width: 174
Height: PARENT_BOTTOM - 30
Children:
Container@NICKNAME_TEMPLATE:
@@ -53,11 +61,11 @@ Container@GLOBALCHAT_PANEL:
Width: PARENT_RIGHT-15
Height: 20
Button@DISCONNECT_BUTTON:
X: 570
X: PARENT_RIGHT-WIDTH
Y: PARENT_BOTTOM - 25
Width: 130
Width: 174
Height: 25
Text: Disconnect
Text: Leave Chat
Font: Bold
Background@GLOBALCHAT_CONNECT_PANEL:
Width: PARENT_RIGHT
@@ -84,6 +92,7 @@ Container@GLOBALCHAT_PANEL:
Y: PARENT_BOTTOM / 4 + 75
Height: 20
Width: 180
Font: Regular
Text: Connect Automatically
Button@CONNECT_BUTTON:
X: 430

View File

@@ -0,0 +1,112 @@
Background@MULTIPLAYER_PANEL:
Logic: MultiplayerLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 808
Height: 600
Children:
Label@TITLE:
Y: 15
Width: PARENT_RIGHT
Height: 25
Text: Multiplayer
Align: Center
Font: Bold
DropDownButton@FILTERS_DROPDOWNBUTTON:
X: 20
Y: 321
Width: 158
Height: 25
Text: Filter Games
Font: Bold
Button@REFRESH_BUTTON:
X: 183
Y: 321
Width: 100
Height: 25
Text: Refresh
Font: Bold
Button@BROWSER_TAB:
X: 288
Y: 315
Width: 105
Height: 31
Text: Browse
Font: Bold
Button@DIRECTCONNECT_TAB:
X: 393
Y: 315
Width: 105
Height: 31
Text: Direct IP
Font: Bold
Button@CREATE_TAB:
X: 498
Y: 315
Width: 105
Height: 31
Text: Create
Font: Bold
Container@TOP_PANELS_ROOT:
X: 20
Y: 37
Width: PARENT_RIGHT - 40
Height: PARENT_BOTTOM
Container@GLOBALCHAT_ROOT:
X: 20
Y: 351
Width: PARENT_RIGHT - 40
Height: PARENT_BOTTOM - 401
TooltipContainer@TOOLTIP_CONTAINER:
Button@BACK_BUTTON:
Key: escape
X: PARENT_RIGHT - WIDTH - 20
Y: PARENT_BOTTOM - HEIGHT - 20
Width: 120
Height: 25
Text: Back
Font: Bold
ScrollPanel@MULTIPLAYER_FILTER_PANEL:
Width: 147
Height: 130
Children:
Checkbox@WAITING_FOR_PLAYERS:
X: 5
Y: 5
Width: 137
Height: 20
Text: Waiting
TextColor: 50,205,50
Font: Regular
Checkbox@EMPTY:
X: 5
Y: 30
Width: 137
Height: 20
Text: Empty
Font: Regular
Checkbox@PASSWORD_PROTECTED:
X: 5
Y: 55
Width: 137
Height: 20
Text: Protected
TextColor: 255,0,0
Font: Regular
Checkbox@ALREADY_STARTED:
X: 5
Y: 80
Width: 137
Height: 20
Text: Started
TextColor: 255,165,0
Font: Regular
Checkbox@INCOMPATIBLE_VERSION:
X: 5
Y: 105
Width: 137
Height: 20
Text: Incompatible
TextColor: 190,190,190
Font: Regular

View File

@@ -1,170 +0,0 @@
Background@SERVERBROWSER_PANEL:
Logic: ServerBrowserLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 740
Height: 645
Children:
Label@MULTIPLAYER_LABEL_TITLE:
X: 0
Y: 15
Width: PARENT_RIGHT
Height: 25
Text: Multiplayer
Align: Center
Font: Bold
Label@SHOW_LABEL_TITLE:
X: 20
Y: 48
Width: 20
Height: 25
Text: Show:
Font: Bold
Checkbox@WAITING_FOR_PLAYERS:
X: 80
Y: 50
Width: 100
Height: 20
Text: Waiting
TextColor: 50,205,50
Checkbox@EMPTY:
X: 180
Y: 50
Width: 100
Height: 20
Text: Empty
Checkbox@PASSWORD_PROTECTED:
X: 270
Y: 50
Width: 100
Height: 20
Text: Protected
TextColor: 255,0,0
Checkbox@ALREADY_STARTED:
X: 385
Y: 50
Width: 100
Height: 20
Text: Started
TextColor: 255,165,0
Checkbox@INCOMPATIBLE_VERSION:
X: 480
Y: 50
Width: 100
Height: 20
Text: Incompatible
TextColor: 190,190,190
ScrollPanel@SERVER_LIST:
X: 20
Y: 80
Width: 700
Height: 240
Children:
ScrollItem@HEADER_TEMPLATE:
BaseName: scrollheader
Width: PARENT_RIGHT-27
Height: 25
X: 2
Visible: false
Children:
Label@LABEL:
Y: 0-1
Font: Bold
Width: PARENT_RIGHT
Height: 25
Align: Center
ScrollItem@SERVER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 68
X: 2
Y: 0
Children:
MapPreview@MAP_PREVIEW:
X: 2
Y: 2
Width: 64
Height: 64
ShowSpawnPoints: no
Label@TITLE:
X: 70
Width: 200
Height: 25
Font: Bold
Label@MAP:
X: 70
Y: 20
Width: 250
Height: 25
Label@PLAYERS:
X: 70
Y: 40
Width: 50
Height: 25
Label@STATE:
Width: 140
X: PARENT_RIGHT-150
Align: Right
Height: 25
Font: Bold
Label@IP:
Width: 140
X: PARENT_RIGHT-150
Y: 20
Align: Right
Height: 25
Label@LOCATION:
Width: 140
X: PARENT_RIGHT-150
Y: 40
Align: Right
Height: 25
Container@GLOBALCHAT_ROOT:
X: 20
Y: 370
Width: 700
Height: 255
Label@PROGRESS_LABEL:
X: (PARENT_RIGHT - WIDTH) / 2
Y: PARENT_BOTTOM / 2 - HEIGHT
Width: 150
Height: 30
Text: Fetching games...
Align: Center
Button@REFRESH_BUTTON:
X: 20
Y: 325
Width: 100
Height: 25
Text: Refresh
Font: Bold
Button@CREATE_BUTTON:
X: PARENT_RIGHT - 120 - 120 - 120 - 120
Y: 325
Width: 100
Height: 25
Text: Create
Font: Bold
Button@DIRECTCONNECT_BUTTON:
X: PARENT_RIGHT - 120 - 120 - 120
Y: 325
Width: 100
Height: 25
Text: Direct IP
Font: Bold
Button@JOIN_BUTTON:
X: PARENT_RIGHT - 120 - 120
Y: 325
Width: 100
Height: 25
Text: Join
Font: Bold
Key: return
Button@BACK_BUTTON:
X: PARENT_RIGHT - 120
Y: 325
Width: 100
Height: 25
Text: Cancel
Font: Bold
Key: escape

View File

@@ -33,8 +33,8 @@ Metrics:
FactionSuffix-soviet: soviet
FactionSuffix-russia: soviet
FactionSuffix-ukraine: soviet
IncompatibleVersionColor: 211,211,211
IncompatibleGameColor: 169,169,169
CantJoinGameColor: 211,211,211
ProtectedGameColor: 255,0,0
IncompatibleProtectedGameColor: 178,34,34
WaitingGameColor: 0,255,0

View File

@@ -104,10 +104,12 @@ ChromeLayout:
./mods/ra/chrome/lobby-globalchat.yaml
./mods/ra/chrome/color-picker.yaml
./mods/ra/chrome/map-chooser.yaml
./mods/ra/chrome/create-server.yaml
./mods/ra/chrome/serverbrowser.yaml
./mods/ra/chrome/multiplayer.yaml
./mods/ra/chrome/multiplayer-browser.yaml
./mods/ra/chrome/multiplayer-createserver.yaml
./mods/ra/chrome/multiplayer-directconnect.yaml
./mods/ra/chrome/multiplayer-globalchat.yaml
./mods/ra/chrome/connection.yaml
./mods/ra/chrome/directconnect.yaml
./mods/ra/chrome/replaybrowser.yaml
./mods/ra/chrome/dropdowns.yaml
./mods/ra/chrome/musicplayer.yaml
@@ -116,7 +118,6 @@ ChromeLayout:
./mods/ra/chrome/missionbrowser.yaml
./mods/ra/chrome/confirmation-dialogs.yaml
./mods/ra/chrome/editor.yaml
./mods/ra/chrome/globalchat.yaml
Weapons:
./mods/ra/weapons/explosions.yaml

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1000 B

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -274,6 +274,8 @@ lobby-bits: spawnpoints.png
admin: 64,5,7,5
colorpicker: 5,5,22,22
huepicker: 71,0,7,15
protected: 79,0,10,13
protected-disabled: 90,0,10,13
strategic: strategic.png
unowned: 0,0,32,32

View File

@@ -26,8 +26,8 @@ Metrics:
SpawnColor: 255,255,255
SpawnContrastColor: 0,0,0
SpawnLabelOffset: 0,1
IncompatibleVersionColor: 255,0,0
IncompatibleGameColor: 169,169,169
CantJoinGameColor: 211,211,211
ProtectedGameColor: 255,0,0
IncompatibleProtectedGameColor: 139,0,0
WaitingGameColor: 0,255,0

View File

@@ -158,10 +158,12 @@ ChromeLayout:
./mods/ra/chrome/lobby-globalchat.yaml
./mods/ts/chrome/color-picker.yaml
./mods/ra/chrome/map-chooser.yaml
./mods/ra/chrome/create-server.yaml
./mods/ra/chrome/serverbrowser.yaml
./mods/ra/chrome/multiplayer.yaml
./mods/ra/chrome/multiplayer-browser.yaml
./mods/ra/chrome/multiplayer-createserver.yaml
./mods/ra/chrome/multiplayer-directconnect.yaml
./mods/ra/chrome/multiplayer-globalchat.yaml
./mods/ra/chrome/connection.yaml
./mods/ra/chrome/directconnect.yaml
./mods/ra/chrome/replaybrowser.yaml
./mods/ts/chrome/dropdowns.yaml
./mods/ra/chrome/musicplayer.yaml
@@ -170,7 +172,6 @@ ChromeLayout:
./mods/ra/chrome/missionbrowser.yaml
./mods/ra/chrome/confirmation-dialogs.yaml
./mods/ra/chrome/editor.yaml
./mods/ra/chrome/globalchat.yaml
Voices:
./mods/ts/audio/voices.yaml