From b49641ecb872b2ad3f9515b355ba6ccb7d5b42f4 Mon Sep 17 00:00:00 2001 From: Regalis Date: Thu, 18 Feb 2016 22:47:46 +0200 Subject: [PATCH] v0.3.2.6: launcher text wrapping fix --- Launcher2/LauncherMain.cs | 12 ++++++------ Subsurface/Barotrauma.csproj.user | 2 +- Subsurface/changelog.txt | 7 ++++--- Subsurface_Solution.v12.suo | Bin 930304 -> 930304 bytes 4 files changed, 11 insertions(+), 10 deletions(-) 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 569f66c8b0587f9037731e9c7f86691a3f19d1bf..d65067001a7a97a05ddb6095e6d5c4a48d991d77 100644 GIT binary patch delta 11108 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 bT9xNB8uh&~Flh6?*_~_ycD_5=k!Afi6f3#& delta 7767 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