epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up lobby logic and visuals.

Browse Source
This commit is contained in:
Paul Chote
2013-04-23 12:17:51 +12:00
parent 9069d98365
commit ed9d8fb7f7
12 changed files with 463 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mods/cnc/chrome.yaml
View File

@@ -386,9 +386,10 @@ music: chrome.png
next: 256,16,16,16
prev: 272,16,16,16
spawnpoints: chrome.png
owned: 256,32,16,16
unowned: 256,48,16,16
lobby-bits: chrome.png
spawn-claimed: 256,32,16,16
spawn-unclaimed: 256,48,16,16
admin: 340,39,7,5
checkbox-bits: chrome.png
checked: 272,32,16,16

108
mods/cnc/chrome/lobby.yaml
View File

@@ -68,15 +68,35 @@ Container@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@PING_BLOCK:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
TextField@NAME:
Text:Name
Width:205
X:15
Width:190
Height:25
MaxLength:16
Visible:false
DropDownButton@BOT_DROPDOWN:
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:205
X:15
Width:190
Height:25
Font:Regular
Visible:false
@@ -136,11 +156,29 @@ Container@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@PING_BLOCK:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
Label@NAME:
Text:Name
Width:200
Width:185
Height:25
X:5
X:15
Y:0-1
Button@KICK:
Text:X
@@ -149,12 +187,12 @@ Container@SERVER_LOBBY:
X:180
Y:2
Font:Bold
ColorBlock@COLOR:
ColorBlock@COLORBLOCK:
X:215
Y:6
Width:35
Height:13
Label@FACTION:
Container@FACTION:
Width:100
Height:25
X:285
@@ -192,9 +230,10 @@ Container@SERVER_LOBBY:
Height:25
Visible:false
Children:
DropDownButton@NAME_HOST:
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:205
X:15
Width:190
Height:25
Font:Regular
Visible:false
@@ -202,7 +241,7 @@ Container@SERVER_LOBBY:
Text:Name
Width:200
Height:25
X:5
X:15
Y:0-1
Visible:false
Button@JOIN:
@@ -219,9 +258,28 @@ Container@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@PING_BLOCK:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
TextField@NAME:
Text:Name
Width:205
X:15
Width:190
Height:25
MaxLength:16
DropDownButton@COLOR:
@@ -256,11 +314,29 @@ Container@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Background@PING_BLOCK:
Background:button
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
Label@NAME:
Text:Name
Width:200
Width:185
Height:25
X:5
X:15
Y:0-1
Button@KICK:
Text:X
@@ -269,7 +345,7 @@ Container@SERVER_LOBBY:
X:180
Y:2
Font:Bold
ColorBlock@COLOR:
ColorBlock@COLORBLOCK:
X:215
Y:6
Width:35
@@ -300,9 +376,9 @@ Container@SERVER_LOBBY:
Button@SPECTATE:
Text:Spectate
Font:Regular
Width:470
Width:455
Height:25
X:0
X:15
Y:0
Container@LABEL_CONTAINER:
X:20

BIN
mods/cnc/uibits/chrome.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

7
mods/d2k/chrome.yaml
View File

@@ -236,9 +236,10 @@ dialog: dialog.png
corner-bl: 191,489,9,9
corner-br: 200,489,9,9
spawnpoints: spawnpoints.png
unowned: 528,128,16,16
owned: 512,128,16,16
lobby-bits: spawnpoints.png
spawn-unclaimed: 528,128,16,16
spawn-claimed: 512,128,16,16
admin: 37,5,7,5
strategic: strategic.png
unowned: 0,0,32,32

107
mods/d2k/chrome/lobby.yaml
View File

@@ -48,16 +48,33 @@ Background@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@PING_BLOCK:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
TextField@NAME:
Text:Name
Width:150
X:15
Width:135
Height:25
X:0
Y:0
MaxLength:16
DropDownButton@BOT_DROPDOWN:
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:150
X:15
Width:135
Height:25
Font:Regular
Visible:false
@@ -117,11 +134,28 @@ Background@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@PING_BLOCK:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
Label@NAME:
Text:Name
Width:145
Width:130
Height:25
X:5
X:20
Y:0-1
Button@KICK:
Text:X
@@ -130,12 +164,12 @@ Background@SERVER_LOBBY:
X:125
Y:2
Font:Bold
ColorBlock@COLOR:
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45
Height:13
Label@FACTION:
Container@FACTION:
Width:130
Height:25
X:250
@@ -167,7 +201,6 @@ Background@SERVER_LOBBY:
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_EMPTY:
X:5
Y:0
@@ -177,15 +210,15 @@ Background@SERVER_LOBBY:
Children:
Label@NAME:
Text:Name
Width:145
Width:130
Height:25
X:5
X:20
Y:0-1
DropDownButton@NAME_HOST:
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:150
Width:135
Height:25
X:0
X:15
Y:0
Visible:false
Button@JOIN:
@@ -201,9 +234,27 @@ Background@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@PING_BLOCK:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
TextField@NAME:
Text:Name
Width:150
X:15
Width:135
Height:25
MaxLength:16
DropDownButton@COLOR:
@@ -238,7 +289,6 @@ Background@SERVER_LOBBY:
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
X:5
Y:0
@@ -246,11 +296,28 @@ Background@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@PING_BLOCK:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
Label@NAME:
Text:Name
Width:145
Width:130
Height:25
X:5
X:20
Y:0-1
Button@KICK:
Text:X
@@ -259,7 +326,7 @@ Background@SERVER_LOBBY:
X:125
Y:2
Font:Bold
ColorBlock@COLOR:
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45

7
mods/ra/chrome.yaml
View File

@@ -169,9 +169,10 @@ dialog: dialog.png
corner-bl: 191,489,9,9
corner-br: 200,489,9,9
spawnpoints: spawnpoints.png
unowned: 528,128,16,16
owned: 512,128,16,16
lobby-bits: spawnpoints.png
spawn-unclaimed: 528,128,16,16
spawn-claimed: 512,128,16,16
admin: 37,5,7,5
strategic: strategic.png
unowned: 0,0,32,32

107
mods/ra/chrome/lobby.yaml
View File

@@ -48,16 +48,33 @@ Background@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@PING_BLOCK:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
TextField@NAME:
Text:Name
Width:150
X:15
Width:135
Height:25
X:0
Y:0
MaxLength:16
DropDownButton@BOT_DROPDOWN:
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:150
X:15
Width:135
Height:25
Font:Regular
Visible:false
@@ -117,11 +134,28 @@ Background@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@PING_BLOCK:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
Label@NAME:
Text:Name
Width:145
Width:130
Height:25
X:5
X:20
Y:0-1
Button@KICK:
Text:X
@@ -130,12 +164,12 @@ Background@SERVER_LOBBY:
X:125
Y:2
Font:Bold
ColorBlock@COLOR:
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45
Height:13
Label@FACTION:
Container@FACTION:
Width:130
Height:25
X:250
@@ -167,7 +201,6 @@ Background@SERVER_LOBBY:
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_EMPTY:
X:5
Y:0
@@ -177,15 +210,15 @@ Background@SERVER_LOBBY:
Children:
Label@NAME:
Text:Name
Width:145
Width:130
Height:25
X:5
X:20
Y:0-1
DropDownButton@NAME_HOST:
DropDownButton@SLOT_OPTIONS:
Text:Name
Width:150
Width:135
Height:25
X:0
X:15
Y:0
Visible:false
Button@JOIN:
@@ -201,9 +234,27 @@ Background@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@PING_BLOCK:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
TextField@NAME:
Text:Name
Width:150
X:15
Width:135
Height:25
MaxLength:16
DropDownButton@COLOR:
@@ -238,7 +289,6 @@ Background@SERVER_LOBBY:
Height:20
ImageCollection:checkbox-bits
ImageName:checked
Container@TEMPLATE_NONEDITABLE_SPECTATOR:
X:5
Y:0
@@ -246,11 +296,28 @@ Background@SERVER_LOBBY:
Height:25
Visible:false
Children:
Image@ADMIN_INDICATOR:
ImageCollection:lobby-bits
ImageName:admin
X:2
Visible:false
Container@PING_BLOCK:
X:0
Y:6
Width:11
Height:14
Visible:false
Children:
ColorBlock@PING_COLOR:
X:2
Y:2
Width:PARENT_RIGHT-4
Height:PARENT_BOTTOM-4
Label@NAME:
Text:Name
Width:145
Width:130
Height:25
X:5
X:20
Y:0-1
Button@KICK:
Text:X
@@ -259,7 +326,7 @@ Background@SERVER_LOBBY:
X:125
Y:2
Font:Bold
ColorBlock@COLOR:
ColorBlock@COLORBLOCK:
X:165
Y:6
Width:45

BIN
mods/ra/uibits/spawnpoints.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB