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

# Conflicts: # Source/Engine/Navigation/NavMesh.cpp # Source/Engine/Navigation/NavMeshBuilder.cpp
2021-01-22 11:31:22 +01:00
parent cbbfb16628 8680aba897
commit 6cbeac6537
178 changed files with 1163 additions and 864 deletions
--- a/Source/Editor/Cooker/Steps/ValidateStep.cpp
+++ b/Source/Editor/Cooker/Steps/ValidateStep.cpp
@@ -65,7 +65,7 @@ bool ValidateStep::Perform(CookingData& data)
        AssetInfo info;
        if (!Content::GetAssetInfo(gameSettings->FirstScene, info))
        {
-            data.Error(TEXT("Missing first scene."));
+            data.Error(TEXT("Missing first scene. Set it in the game settings."));
            return true;
        }
    }