diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs index d8f1290f04..6bb32a9038 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs @@ -599,6 +599,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic password.GetImageName = () => canJoin ? "protected" : "protected-disabled"; } + var auth = item.GetOrNull("REQUIRES_AUTHENTICATION"); + if (auth != null) + { + auth.IsVisible = () => game.Authentication; + auth.GetImageName = () => canJoin ? "authentication" : "authentication-disabled"; + + if (game.Protected && password != null) + auth.Bounds.X -= password.Bounds.Width + 5; + } + var players = item.GetOrNull("PLAYERS"); if (players != null) { diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index 37a463d4fe..ddd61ffbd0 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -449,8 +449,10 @@ 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 + protected: 402,97,12,13 + protected-disabled: 402,113,12,13 + authentication: 418,97,12,13 + authentication-disabled: 418,113,12,13 admin-registered: 448,112,16,16 admin-anonymous: 464,112,16,16 player-registered: 480,112,16,16 diff --git a/mods/cnc/chrome/lobby-servers.yaml b/mods/cnc/chrome/lobby-servers.yaml index c4f3cf9d22..8ea6e85bec 100644 --- a/mods/cnc/chrome/lobby-servers.yaml +++ b/mods/cnc/chrome/lobby-servers.yaml @@ -87,17 +87,26 @@ Container@LOBBY_SERVERS_BIN: Children: Label@TITLE: X: 5 - Width: 255 + Width: 245 Height: 25 Image@PASSWORD_PROTECTED: X: 272 Y: 6 - Width: 8 - Height: 10 + Width: 12 + Height: 13 ImageCollection: lobby-bits TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP TooltipText: Requires Password + Image@REQUIRES_AUTHENTICATION: + X: 272 + Y: 6 + Width: 12 + Height: 13 + ImageCollection: lobby-bits + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: SIMPLE_TOOLTIP + TooltipText: Requires OpenRA forum account LabelWithTooltip@PLAYERS: X: 290 Width: 85 diff --git a/mods/cnc/chrome/multiplayer-browser.yaml b/mods/cnc/chrome/multiplayer-browser.yaml index 5361877f51..e0e7fc83ea 100644 --- a/mods/cnc/chrome/multiplayer-browser.yaml +++ b/mods/cnc/chrome/multiplayer-browser.yaml @@ -108,17 +108,26 @@ Container@MULTIPLAYER_PANEL: Children: Label@TITLE: X: 5 - Width: 255 + Width: 245 Height: 25 Image@PASSWORD_PROTECTED: X: 272 Y: 6 - Width: 8 - Height: 10 + Width: 12 + Height: 13 ImageCollection: lobby-bits TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP TooltipText: Requires Password + Image@REQUIRES_AUTHENTICATION: + X: 272 + Y: 6 + Width: 12 + Height: 13 + ImageCollection: lobby-bits + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: SIMPLE_TOOLTIP + TooltipText: Requires OpenRA forum account LabelWithTooltip@PLAYERS: X: 290 Width: 85 diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png index 64b6dc8603..2bb57bd517 100644 Binary files a/mods/cnc/uibits/chrome.png and b/mods/cnc/uibits/chrome.png differ diff --git a/mods/common/chrome/lobby-servers.yaml b/mods/common/chrome/lobby-servers.yaml index f13334f794..fb8f5b04bc 100644 --- a/mods/common/chrome/lobby-servers.yaml +++ b/mods/common/chrome/lobby-servers.yaml @@ -84,17 +84,26 @@ Container@LOBBY_SERVERS_BIN: Children: Label@TITLE: X: 5 - Width: 255 + Width: 245 Height: 25 Image@PASSWORD_PROTECTED: X: 272 Y: 6 - Width: 10 - Height: 12 + Width: 12 + Height: 13 ImageCollection: lobby-bits TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP TooltipText: Requires Password + Image@REQUIRES_AUTHENTICATION: + X: 272 + Y: 6 + Width: 12 + Height: 13 + ImageCollection: lobby-bits + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: SIMPLE_TOOLTIP + TooltipText: Requires OpenRA forum account LabelWithTooltip@PLAYERS: X: 290 Width: 85 diff --git a/mods/common/chrome/multiplayer-browser.yaml b/mods/common/chrome/multiplayer-browser.yaml index 473cfc75d4..2480b343d8 100644 --- a/mods/common/chrome/multiplayer-browser.yaml +++ b/mods/common/chrome/multiplayer-browser.yaml @@ -100,17 +100,26 @@ Background@MULTIPLAYER_PANEL: Children: Label@TITLE: X: 5 - Width: 255 + Width: 245 Height: 25 Image@PASSWORD_PROTECTED: X: 272 Y: 6 - Width: 10 - Height: 12 + Width: 12 + Height: 13 ImageCollection: lobby-bits TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP TooltipText: Requires Password + Image@REQUIRES_AUTHENTICATION: + X: 272 + Y: 6 + Width: 12 + Height: 13 + ImageCollection: lobby-bits + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: SIMPLE_TOOLTIP + TooltipText: Requires OpenRA forum account LabelWithTooltip@PLAYERS: X: 290 Width: 85 diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml index d9d01368f1..11e6294900 100644 --- a/mods/d2k/chrome.yaml +++ b/mods/d2k/chrome.yaml @@ -215,6 +215,8 @@ lobby-bits: buttons.png huepicker: 193,0,7,15 protected: 200,0,12,13 protected-disabled: 211,0,12,13 + authentication: 199,16,12,13 + authentication-disabled: 212,16,12,13 admin-registered: 224,0,16,16 admin-anonymous: 240,0,16,16 player-registered: 224,16,16,16 diff --git a/mods/d2k/uibits/buttons.png b/mods/d2k/uibits/buttons.png index 3cf1862b9b..5c8e413608 100644 Binary files a/mods/d2k/uibits/buttons.png and b/mods/d2k/uibits/buttons.png differ diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index db66fbb000..1e3847b415 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -531,8 +531,10 @@ lobby-bits: buttons.png admin: 187,5,7,5 colorpicker: 127,5,23,22 huepicker: 194,0,7,15 - protected: 202,0,10,13 - protected-disabled: 213,0,10,13 + protected: 201,0,12,13 + protected-disabled: 212,0,12,13 + authentication: 199,16,12,13 + authentication-disabled: 212,16,12,13 admin-registered: 224,0,16,16 admin-anonymous: 240,0,16,16 player-registered: 224,16,16,16 diff --git a/mods/ra/uibits/buttons.png b/mods/ra/uibits/buttons.png index edcc6e3c71..df2f7780f6 100644 Binary files a/mods/ra/uibits/buttons.png and b/mods/ra/uibits/buttons.png differ diff --git a/mods/ts/chrome.yaml b/mods/ts/chrome.yaml index 79f53e431f..a7ea27b868 100644 --- a/mods/ts/chrome.yaml +++ b/mods/ts/chrome.yaml @@ -377,6 +377,8 @@ lobby-bits: buttons.png huepicker: 194,0,7,15 protected: 202,0,10,13 protected-disabled: 213,0,10,13 + authentication: 199,16,12,13 + authentication-disabled: 212,16,12,13 admin-registered: 224,0,16,16 admin-anonymous: 240,0,16,16 player-registered: 224,16,16,16 diff --git a/mods/ts/uibits/buttons.png b/mods/ts/uibits/buttons.png index b233ad4785..306746cd79 100644 Binary files a/mods/ts/uibits/buttons.png and b/mods/ts/uibits/buttons.png differ