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

This commit is contained in:
Joonas Rikkonen
2019-05-03 13:49:41 +03:00
parent a11e7db190
commit a445911665
3 changed files with 33 additions and 299 deletions
@@ -78,6 +78,8 @@ namespace Barotrauma
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUIButton loadGameButton;
public Action<Submarine, string, string> StartNewGame;