(cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai

2019-05-16 05:45:37 +03:00
parent 04997cd2f3
commit 68ced76e1b
53 changed files with 791 additions and 243 deletions
@@ -240,6 +240,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

+        private GUILayoutGroup subPreviewContainer;
+
        private GUIButton loadGameButton;
        
        public Action<Submarine, string, string> StartNewGame;
@@ -509,7 +511,7 @@ namespace Barotrauma
                    {
                        IsFixedSize = false
                    },
-                        TextManager.Get("Shuttle"), textAlignment: Alignment.Right, font: GUI.SmallFont)
+                        TextManager.Get("Shuttle", fallBackTag: "RespawnShuttle"), textAlignment: Alignment.Right, font: GUI.SmallFont)
                    {
                        TextColor = textBlock.TextColor * 0.8f,
                        ToolTip = textBlock.ToolTip