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

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:14:43 +03:00
parent 9c964b7843
commit 61f5ccc71d
33 changed files with 334 additions and 282 deletions
@@ -789,10 +789,6 @@ 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