Merge branch 'develop' into LYN-4700

Signed-off-by: igarri <igarri@amazon.com>
2021-08-06 10:18:26 +01:00
parent 6fb250c66b 70ae5c2d40
commit 9d2b99b558
322 changed files with 1656 additions and 1274 deletions
@@ -388,6 +388,7 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING

    //! Source Control Enabling.
    bool enableSourceControl;
+    bool clearConsoleOnGameModeStart;

    //! Text editor.
    QString textEditorForScript;