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

This commit is contained in:
Joonas Rikkonen
2019-05-03 13:54:14 +03:00
parent c6b36682a8
commit 3ea53f6c39
3 changed files with 59 additions and 216 deletions
@@ -110,6 +110,8 @@ namespace Barotrauma
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUIButton loadGameButton;
public Action<Submarine, string, string> StartNewGame;