Merge branch 'stabilization/2106' into tomhh_stabilization-to-development

This commit is contained in:
hultonha
2021-06-11 09:43:11 +01:00
306 changed files with 4155 additions and 1477 deletions
+4
View File
@@ -593,6 +593,8 @@ void CGameEngine::SwitchToInGame()
&AzFramework::InputSystemCursorRequests::SetSystemCursorState,
AzFramework::SystemCursorState::ConstrainedAndHidden);
}
Log("Entered game mode");
}
void CGameEngine::SwitchToInEditor()
@@ -647,6 +649,8 @@ void CGameEngine::SwitchToInEditor()
AzFramework::InputSystemCursorRequestBus::Event(AzFramework::InputDeviceMouse::Id,
&AzFramework::InputSystemCursorRequests::SetSystemCursorState,
AzFramework::SystemCursorState::UnconstrainedAndVisible);
Log("Exited game mode");
}
void CGameEngine::HandleQuitRequest(IConsoleCmdArgs* /*args*/)