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

2019-05-16 06:14:05 +03:00
parent 5f524ddd3f
commit af07862995
12 changed files with 155 additions and 319 deletions
@@ -442,6 +442,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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