Merge pull request #12600 from pchote/externalmods

Add support for switching to mods from other engine installations.
This commit is contained in:
reaperrr
2017-02-12 13:18:53 +01:00
committed by GitHub
19 changed files with 443 additions and 32 deletions

View File

@@ -90,3 +90,72 @@ Container@CONNECTIONFAILED_PANEL:
Width: 140
Height: 35
Text: Retry
Container@CONNECTION_SWITCHMOD_PANEL:
Logic: ConnectionSwitchModLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - 90)/2
Width: 370
Height: 134
Children:
Label@TITLE:
Width: PARENT_RIGHT
Y: 0-25
Font: BigBold
Contrast: true
Align: Center
Text: Switch Mod
Background@CONNECTION_BACKGROUND:
Width: 370
Height: 120
Background: panel-black
Children:
Label@DESC:
Y: 15
Width: PARENT_RIGHT
Height: 25
Text: This server is running a different mod:
Font: Bold
Align: Center
Container@MOD_CONTAINER:
X: 0
Y: 42
Width: PARENT_RIGHT
Children:
RGBASprite@MOD_ICON:
Y: 4
Width: 32
Height: 32
Label@MOD_TITLE:
X: 37
Width: PARENT_RIGHT - 37
Height: 25
Font: Bold
Align: Left
Label@MOD_VERSION:
X: 37
Y: 15
Width: PARENT_RIGHT - 37
Height: 25
Font: Tiny
Align: Left
Label@DESC2:
Y: 80
Width: PARENT_RIGHT
Height: 25
Text: Switch mods and join server?
Font: Bold
Align: Center
Button@ABORT_BUTTON:
Key: escape
Y: 119
Width: 140
Height: 35
Text: Abort
Button@SWITCH_BUTTON:
Key: return
X: 230
Y: 119
Width: 140
Height: 35
Text: Switch

BIN
mods/cnc/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
mods/d2k/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -88,3 +88,71 @@ Background@CONNECTING_PANEL:
Text: Abort
Font: Bold
Key: escape
Background@CONNECTION_SWITCHMOD_PANEL:
Logic: ConnectionSwitchModLogic
X: (WINDOW_RIGHT - WIDTH)/2
Y: (WINDOW_BOTTOM - HEIGHT)/2
Width: 450
Height: 191
Children:
Label@TITLE:
X: 0
Y: 20
Width: 450
Height: 25
Align: Center
Font: Bold
Text: Switch Mod
Label@DESC:
Y: 45
Width: PARENT_RIGHT
Height: 25
Text: This server is running a different mod:
Font: Bold
Align: Center
Container@MOD_CONTAINER:
X: 0
Y: 72
Width: PARENT_RIGHT
Children:
RGBASprite@MOD_ICON:
Y: 4
Width: 32
Height: 32
Label@MOD_TITLE:
X: 37
Width: PARENT_RIGHT - 37
Height: 25
Font: Bold
Align: Left
Label@MOD_VERSION:
X: 37
Y: 15
Width: PARENT_RIGHT - 37
Height: 25
Font: Tiny
Align: Left
Label@DESC2:
Y: 110
Width: PARENT_RIGHT
Height: 25
Text: Switch mods and join server?
Font: Bold
Align: Center
Button@SWITCH_BUTTON:
X: PARENT_RIGHT - 430
Y: PARENT_BOTTOM - 45
Width: 160
Height: 25
Text: Switch
Font: Bold
Key: return
Button@ABORT_BUTTON:
X: PARENT_RIGHT - 180
Y: PARENT_BOTTOM - 45
Width: 160
Height: 25
Text: Cancel
Font: Bold
Key: escape

BIN
mods/ra/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
mods/ts/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB