(990e36132) Merge branch 'human-ai' into dev

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:50:20 +03:00
parent 566f1d16e4
commit ef374ada71
17 changed files with 178 additions and 465 deletions
@@ -274,6 +274,8 @@ namespace Barotrauma
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUIButton loadGameButton;
public Action<Submarine, string, string> StartNewGame;