(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
@@ -1205,7 +1205,6 @@ namespace Barotrauma
                AbsoluteSpacing = 5,
                Stretch = true
            };
-#endif

            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedSaveFrame.RectTransform),                 
                TextManager.Get("SaveItemAssemblyDialogHeader"), font: GUI.LargeFont);