(1b9acec1a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:22:19 +03:00
parent ed2f3f0b11
commit 3e8d6cdfc8
12 changed files with 423 additions and 90 deletions
@@ -500,6 +500,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

+        private GUILayoutGroup subPreviewContainer;
+
        private GUIButton loadGameButton;
        
        public Action<Submarine, string, string> StartNewGame;