diff --git a/Launcher2/LauncherMain.cs b/Launcher2/LauncherMain.cs index 0e01ee4dd..c5a86e215 100644 --- a/Launcher2/LauncherMain.cs +++ b/Launcher2/LauncherMain.cs @@ -286,20 +286,20 @@ namespace Launcher2 { updateInfoBox.ClearChildren(); - string wrappedText = ToolBox.WrapText(text, updateInfoBox.Rect.Width, GUI.SmallFont); + //string wrappedText = ToolBox.WrapText(text, updateInfoBox.Rect.Width, GUI.SmallFont); - int lineHeight = (int)GUI.SmallFont.MeasureString(" ").Y; + //int lineHeight = (int)GUI.SmallFont.MeasureString(" ").Y; - string[] lines = wrappedText.Split('\n'); + string[] lines = text.Split('\n'); foreach (string line in lines) { if (string.IsNullOrWhiteSpace(line)) continue; GUITextBlock textBlock = new GUITextBlock( - new Rectangle(0,0,0,lineHeight), + new Rectangle(0,0,0,0), line, GUI.Style, Alignment.TopLeft, Alignment.TopLeft, - updateInfoBox, false, GUI.SmallFont); + updateInfoBox, true, GUI.SmallFont); textBlock.CanBeFocused = false; } @@ -441,7 +441,7 @@ namespace Launcher2 innerText = innerText.Replace("\r\n", "\n"); sb.Append(innerText+"\n"); - sb.AppendLine("*************************************\n"); + sb.AppendLine("----------------------------\n"); } SetUpdateInfoBox(sb.ToString()); diff --git a/Subsurface/Barotrauma.csproj.user b/Subsurface/Barotrauma.csproj.user index 1782abafa..df35fcf91 100644 --- a/Subsurface/Barotrauma.csproj.user +++ b/Subsurface/Barotrauma.csproj.user @@ -9,7 +9,7 @@ en-US false - ShowAllFiles + ProjectFiles diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt index f5643c177..cc01a7654 100644 --- a/Subsurface/changelog.txt +++ b/Subsurface/changelog.txt @@ -3,11 +3,12 @@ v0.3.2.6 --------------------------------------------------------------------------------------------------------- - fixed the broken password box -- location types and missions are included in content packages +- maximum number of players per server increased to 16 (note that none of the vanilla subs have been +designed for a crew that large) - junction boxes and power sources can be connected with multiple parallel wires without multiplying the power output -- - +- velocity and depth readings on navigation terminals +- location types and missions are included in content packages --------------------------------------------------------------------------------------------------------- v0.3.2.5 diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo index 569f66c8b..d65067001 100644 Binary files a/Subsurface_Solution.v12.suo and b/Subsurface_Solution.v12.suo differ