Merge remote-tracking branch 'origin/master' into Menu

2016-03-09 17:24:41 +01:00
parent 1104166039 3ea1177425
commit 7e7d98eaae
40 changed files with 1175 additions and 11568 deletions
@@ -219,7 +219,7 @@ void Game::Tick()
    PerformanceTimer::StartTimerAndStopPrevious("InputProxy");
    m_InputProxy->Update(dt);
    m_EventBroker->Swap();
-    m_InputProxy->Process();
+    m_InputProxy->Process(ImGui::GetIO().WantCaptureKeyboard || ImGui::GetIO().WantCaptureMouse);
    m_EventBroker->Swap();

    PerformanceTimer::StartTimerAndStopPrevious("SoundManager");