(d7a4efa97) Merge branch 'human-ai' into dev

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:19:27 +03:00
parent e8ee3f9d18
commit 69494dcde8
15 changed files with 358 additions and 157 deletions
@@ -789,6 +789,10 @@ namespace Barotrauma
GUI.Draw(Cam, spriteBatch);
spriteBatch.Begin(SpriteSortMode.Deferred, null, null, null, GameMain.ScissorTestEnable);
GUI.Draw(Cam, spriteBatch);
GUI.Draw(Cam, spriteBatch);
#if DEBUG