From 2a20b68f3cb7dc97d48a8963b4563eb2c3681367 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 23 May 2019 15:11:49 +0300 Subject: [PATCH] (33a87d5c8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev --- .../Items/Components/Signal/Connection.cs | 4 +-- .../Source/Screens/MainMenuScreen.cs | 34 +++++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs index d5ab17ccb..294f6214b 100644 --- a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs +++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs @@ -57,8 +57,8 @@ namespace Barotrauma.Items.Components } } - Vector2 rightPos = new Vector2(x + width - 130 * GUI.xScale, y + 80 * GUI.yScale); - Vector2 leftPos = new Vector2(x + 130 * GUI.xScale, y + 80 * GUI.yScale); + Vector2 rightPos = new Vector2(x + width - 110 * GUI.xScale, y + 80 * GUI.yScale); + Vector2 leftPos = new Vector2(x + 110 * GUI.xScale, y + 80 * GUI.yScale); Vector2 rightWirePos = new Vector2(x + width - 5 * GUI.xScale, y + 30 * GUI.yScale); Vector2 leftWirePos = new Vector2(x + 5 * GUI.xScale, y + 30 * GUI.yScale); diff --git a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs index 1643c78e9..c64c63a68 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs @@ -521,13 +521,6 @@ namespace Barotrauma GUIButton otherButton = child as GUIButton; if (otherButton == null || otherButton == button) continue; - return true; - } - - public bool ReturnToMainMenu(GUIButton button, object obj) - { - GUI.PreventPauseMenuToggle = false; - if (Selected != this) { Select(); @@ -625,6 +618,33 @@ namespace Barotrauma #endif } } + + for (int i = 0; i < tutorialList.Content.Children.Count(); i++) + { + if (i < completedTutorials + 1) + { + (tutorialList.Content.GetChild(i) as GUITextBlock).TextColor = Color.LightGreen; +#if !DEBUG + (tutorialList.Content.GetChild(i) as GUITextBlock).CanBeFocused = true; +#endif + } + else + { + (tutorialList.Content.GetChild(i) as GUITextBlock).TextColor = Color.Gray; +#if !DEBUG + (tutorialList.Content.GetChild(i) as GUITextBlock).CanBeFocused = false; +#endif + } + } + } + + public void ResetSettingsFrame(GameSettings.Tab selectedTab = GameSettings.Tab.Graphics) + { + menuTabs[(int)Tab.Settings].RectTransform.ClearChildren(); + GameMain.Config.ResetSettingsFrame(); + GameMain.Config.CreateSettingsFrame(selectedTab); + GameMain.Config.SettingsFrame.RectTransform.Parent = menuTabs[(int)Tab.Settings].RectTransform; + GameMain.Config.SettingsFrame.RectTransform.RelativeSize = Vector2.One; } public void ResetSettingsFrame(GameSettings.Tab selectedTab = GameSettings.Tab.Graphics)