Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tweak] Connection Change #9

Merged
merged 1 commit into from
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Content.Client/MainMenu/UI/MainMenuControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
VerticalExpand="True"
StyleIdentifier="mainMenuVBox"
SeparationOverride="3">
<TextureRect Name="Logo"
<TextureRect Name="BorderUp"
Stretch="KeepCentered"/>
<GridContainer Columns="2">
<Label Text="{Loc 'main-menu-username-label'}" />
Expand Down Expand Up @@ -43,5 +43,7 @@
<clog:ChangelogButton
Name="ChangelogButton"
Access="Public"/>
<TextureRect Name="BorderDown"
Stretch="KeepCentered"/>
</BoxContainer>
</Control>
8 changes: 8 additions & 0 deletions Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,16 @@ public MainMenuControl(IResourceCache resCache, IConfigurationManager configMan)
LayoutContainer.SetMarginTop(VBox, 30);
LayoutContainer.SetGrowHorizontal(VBox, LayoutContainer.GrowDirection.Begin);

/* Everwood REMOVE
var logoTexture = resCache.GetResource<TextureResource>("/Textures/_White/Logo/icon/icon-256x256.png"); // WD EDIT
Logo.Texture = logoTexture;
*/

var borderUpTexture = resCache.GetResource<TextureResource>("/Textures/_Everwood/Logo/border_up.png"); // Everwood
BorderUp.Texture = borderUpTexture;

var borderDownTexture = resCache.GetResource<TextureResource>("/Textures/_Everwood/Logo/border_down.png"); // Everwood
BorderDown.Texture = borderDownTexture;

var currentUserName = configMan.GetCVar(CVars.PlayerName);
UsernameBox.Text = currentUserName;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_Everwood/Logo/border_up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_Everwood/Logo/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Resources/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
defaultWindowTitle: White Dream
windowIconSet: /Textures/_White/Logo/icon
splashLogo: /Textures/_White/Logo/WWDPDarkSplashIcon.png
defaultWindowTitle: SS14 - Everwood
windowIconSet: /Textures/_Everwood/Logo/icon
splashLogo: /Textures/_Everwood/Logo/splash.png
Loading