Merge remote-tracking branch 'origin/1.1' into 1.2

# Conflicts: # Source/Editor/Editor.Build.cs
2021-03-15 09:38:58 +01:00
parent 4072796e54 afea02d92f
commit c7c339957b
86 changed files with 4242 additions and 317 deletions
--- a/Source/Engine/Core/Config/GameSettings.cpp
+++ b/Source/Engine/Core/Config/GameSettings.cpp
@@ -100,7 +100,12 @@ bool GameSettings::Load()
    auto settings = Get();
    if (!settings)
    {
+#if USE_EDITOR
+        // Allow lack of Game Settings in Editor
+        return false;
+#else
        return true;
+#endif
    }

    // Preload all settings assets