v0.3.2.6: launcher text wrapping fix

FakeFishGames · Feb 18, 2016 · b49641e · b49641e
1 parent 9e11134
commit b49641e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Launcher2/LauncherMain.cs b/Launcher2/LauncherMain.cs
@@ -286,20 +286,20 @@ private void SetUpdateInfoBox(string text)
         {
             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 @@ private bool CheckUpdateXML(XDocument doc)
                     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
@@ -9,7 +9,7 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>en-US</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup>
     <ReferencePath>

diff --git 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