Facilitated spawn choice at game setup screen.

This commit is contained in:
Matija H
2014-04-25 21:56:01 +01:00
committed by matija-hustic
parent a7c77d4155
commit a0f6038ea6
17 changed files with 175 additions and 54 deletions

View File

@@ -42,6 +42,22 @@ ScrollPanel@TEAM_DROPDOWN_TEMPLATE:
Height: 25
Align: Center
ScrollPanel@SPAWN_DROPDOWN_TEMPLATE:
Width: DROPDOWN_WIDTH
Children:
ScrollItem@TEMPLATE:
Width: PARENT_RIGHT-27
Height: 25
X: 2
Y: 0
Visible: false
Children:
Label@LABEL:
X: 0
Width: PARENT_RIGHT
Height: 25
Align: Center
ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Width: DROPDOWN_WIDTH
Children:

View File

@@ -91,7 +91,7 @@ Background@KICK_SPECTATORS_DIALOG:
Background@LOBBY_OPTIONS_BIN:
X: 20
Y: 67
Width: 535
Width: 593
Height: 235
Background: dialog3
Children:

View File

@@ -2,7 +2,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
X: 20
Y: 67
ItemSpacing: 5
Width: 535
Width: 593
Height: 235
Children:
Container@TEMPLATE_EDITABLE_PLAYER:
@@ -78,15 +78,20 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Width: 48
Height: 25
Text: Team
DropDownButton@SPAWN:
X: 478
Width: 48
Height: 25
Text: Spawn
Checkbox@STATUS_CHECKBOX:
X: 477
X: 535
Y: 2
Width: 20
Height: 20
Visible: false
Image@STATUS_IMAGE:
Visible: false
X: 479
X: 537
Y: 4
Width: 20
Height: 20
@@ -166,7 +171,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Y: 0
Image@STATUS_IMAGE:
Visible: false
X: 479
X: 537
Y: 4
Width: 20
Height: 20
@@ -194,7 +199,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Visible: false
Button@JOIN:
Text: Play in this slot
Width: 278
Width: 336
Height: 25
X: 190
Y: 0
@@ -235,7 +240,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
MaxLength: 16
Label@SPECTATOR:
Text: Spectator
Width: 278
Width: 336
Height: 25
X: 190
Y: 0
@@ -285,7 +290,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Font: Bold
Label@SPECTATOR:
Text: Spectator
Width: 278
Width: 336
Height: 25
X: 190
Y: 0
@@ -308,7 +313,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Button@SPECTATE:
Text: Spectate
Font: Regular
Width: 278
Width: 336
Height: 25
X: 190
Y: 0

View File

@@ -2,7 +2,7 @@ Background@SERVER_LOBBY:
Logic: LobbyLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 800
Width: 858
Height: 600
Children:
ColorPreviewManager@COLOR_MANAGER:
@@ -48,8 +48,15 @@ Background@SERVER_LOBBY:
Text: Team
Align: Center
Font: Bold
Label@LABEL_LOBBY_TEAM:
X: 478
Width: 48
Height: 25
Text: Spawn
Align: Center
Font: Bold
Label@LABEL_LOBBY_STATUS:
X: 477
X: 535
Width: 20
Height: 25
Text: Ready
@@ -59,35 +66,35 @@ Background@SERVER_LOBBY:
DropDownButton@SLOTS_DROPDOWNBUTTON:
X: 20
Y: PARENT_BOTTOM - 291
Width: 151
Width: 167
Height: 25
Font: Bold
Text: Slot Admin
Button@OPTIONS_BUTTON:
X: 178
X: 194
Y: PARENT_BOTTOM - 291
Width: 121
Width: 135
Height: 25
Font: Bold
Text: Game Options
Button@CHANGEMAP_BUTTON:
X: 306
X: 336
Y: PARENT_BOTTOM - 291
Width: 121
Width: 135
Height: 25
Text: Change Map
Font: Bold
Button@START_GAME_BUTTON:
X: 434
X: 478
Y: PARENT_BOTTOM - 291
Width: 121
Width: 135
Height: 25
Text: Start Game
Font: Bold
ScrollPanel@CHAT_DISPLAY:
X: 20
Y: PARENT_BOTTOM - HEIGHT - 52
Width: 760
Width: 818
Height: 210
ItemSpacing: 1
Children:

View File

@@ -19,3 +19,6 @@ Metrics:
TextContrast: false
TextContrastColor: 0,0,0
ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
SpawnFont: Bold
SpawnColor: 255,255,255
SpawnContrastColor: 0,0,0