(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
@@ -60,7 +60,7 @@ namespace Barotrauma
            GUI.Style.Apply(Header, "", this);
            Header.RectTransform.MinSize = new Point(0, Header.Rect.Height);

-            if (height == 0)
+            if (!string.IsNullOrWhiteSpace(text))
            {
                Text = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), Content.RectTransform), 
                    text, textAlignment: textAlignment, wrap: true);