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

Merge remote-tracking branch 'upstream/master' into ups

Browse Source
This commit is contained in:
Jabak
2024-09-29 13:08:38 +03:00
parent b4f67b1963 f051d0087c
commit b09f28657f
128 changed files with 1836 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Lobby/LobbyState.cs
View File

@@ -295,17 +295,17 @@ namespace Content.Client.Lobby
private void MakeButtonReady(OhioLobbyTextButton button)
{
button.ButtonText = "Ready";
button.ButtonText = "Готов";
}
private void MakeButtonUnReady(OhioLobbyTextButton button)
{
button.ButtonText = "Not Ready";
button.ButtonText = "Не готов";
}
private void MakeButtonJoinGame(OhioLobbyTextButton button)
{
button.ButtonText = "Join Game";
button.ButtonText = "Присоединиться к игре";
}
private async void PopulateChangelog()

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

@@ -75,32 +75,38 @@
Access="Public"
ToggleMode="True"
ButtonText="Ready"
Margin="0 0 0 10" />
Margin="0 0 0 7" />
<buttons:OhioUICommandButton
Name="ObserveButton"
WindowType="{x:Type lobbyUi:ObserveWarningWindow}"
Access="Public"
ButtonText="Observe"
Margin="0 10 0 10" />
ButtonText="Наблюдать"
Margin="0 7 0 7" />
<buttons:OhioLobbyTextButton
Name="CharacterSetupButton"
Access="Public"
ButtonText="Character Setup"
Margin="0 10 0 10" />
ButtonText="Настройка персонажа"
Margin="0 7 0 7" />
<buttons:OhioLobbyTextButton
Name="OptionsButton"
Access="Public"
ButtonText="Options"
Margin="0 10 0 10" />
ButtonText="Опции"
Margin="0 7 0 7" />
<buttons:OhioLobbyTextButton
Name="AHelpButton"
Access="Public"
ButtonText="AHelp"
Margin="0 7 0 8" />
<buttons:OhioLobbyTextButton
Name="DiscordButton"
Access="Public"
ButtonText="Привязать Discord"
Margin="0 10 0 10" />
Margin="0 7 0 7" />
<buttons:OhioLobbyTextButton
Name="AHelpButton"
@@ -111,8 +117,8 @@
<buttons:OhioLobbyTextButton
Name="QuitButton"
Access="Public"
ButtonText="Quit"
Margin="0 10 0 0" />
ButtonText="Выйти"
Margin="0 7 0 0" />
</BoxContainer>