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

2019-05-06 11:22:36 +03:00
parent b797d112b7
commit 65d627d57c
11 changed files with 237 additions and 132 deletions
@@ -144,6 +144,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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