Merge remote-tracking branch 'origin/gi' into large-worlds

# Conflicts: # Source/Engine/Core/Math/Vector3.h
2022-05-21 19:45:13 +02:00
parent f53a5ff536 1a64df9116
commit 785f8915b7
280 changed files with 7660 additions and 2355 deletions
--- a/Source/Engine/Platform/Windows/WindowsPlatform.cpp
+++ b/Source/Engine/Platform/Windows/WindowsPlatform.cpp
@@ -176,8 +176,12 @@ void GetWindowsVersion(String& windowsName, int32& versionMajor, int32& versionM
            VersionMajor = 6;
            VersionMinor = 2;
        }
-
-        if (VersionMajor == 0 && VersionMinor == 0)
+        else if (VersionMajor >= 10 && VersionBuild >= 22000)
+        {
+            // Windows 11
+            windowsName.Replace(TEXT("10"), TEXT("11"));
+        }
+        else if (VersionMajor == 0 && VersionMinor == 0)
        {
            String windowsVersion;
            GetStringRegKey(hKey, TEXT("CurrentVersion"), windowsVersion, TEXT(""));