Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'WD-core/master' into Upstream-9

Browse Source
This commit is contained in:
BIGZi0348
2024-12-10 00:12:26 +03:00
parent e3c519c822 343d37e5ad
commit 8778b5b00e
17 changed files with 44741 additions and 2671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Client/Lobby/UI/LobbyGui.xaml
View File

@@ -55,7 +55,7 @@
<Control VerticalExpand="True" />
<RichTextLabel Name="LabelName" Access="Public" HorizontalAlignment="Left"
VerticalAlignment="Center" Margin="0 0 0 420" />
VerticalAlignment="Center" Margin="0 0 0 450" />
<!-- Left Bot Panel -->
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom">
@@ -96,6 +96,18 @@
ButtonText="Опции"
Margin="0 7 0 7" />
<buttons:OhioLobbyTextButton
Name="AHelpButton"
Access="Public"
ButtonText="AHelp"
Margin="0 7 0 7" />
<buttons:OhioLobbyTextButton
Name="ChangelogWD"
Access="Public"
ButtonText="Изменения"
Margin="0 7 0 7" />
<buttons:OhioLobbyTextButton
Name="DiscordButton"
Access="Public"

2
Content.Client/Lobby/UI/LobbyGui.xaml.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.Lobby.UI
OptionsButton.OnPressed += _ => _userInterfaceManager.GetUIController<OptionsUIController>().ToggleWindow();
DiscordButton.OnPressed += _ => _stalinManager.RequestUri();
ChangelogAmour.OnPressed += _ => _userInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
ChangelogWD.OnPressed += _ => _userInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
QuitButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect");
}