(19b26d13b) Merge branch 'dev' into human-ai

2019-05-16 05:08:39 +03:00
parent 454dda56c7
commit 616efac2bf
14 changed files with 150 additions and 134 deletions
@@ -180,6 +180,10 @@ namespace Barotrauma

            GUI.KeyboardDispatcher = new EventInput.KeyboardDispatcher(Window);

+            GUI.KeyboardDispatcher = new EventInput.KeyboardDispatcher(Window);
+
+
+            PerformanceCounter = new PerformanceCounter();

            PerformanceCounter = new PerformanceCounter();