Merge branch 'master' into Fronts

Content.Client/MainMenu/UI/MainMenuControl.xaml

@@ -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'}" />
@@ -43,5 +43,7 @@
         <clog:ChangelogButton
             Name="ChangelogButton"
             Access="Public"/>
+        <TextureRect Name="BorderDown"
+                     Stretch="KeepCentered"/>
     </BoxContainer>
 </Control>

Content.Client/MainMenu/UI/MainMenuControl.xaml.cs

@@ -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;

Resources/manifest.yml

@@ -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