Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -26,7 +26,7 @@ namespace ProjectSettingsTool
            : m_projectName("")
            , m_productName("")
            , m_executableName("")
-            , m_sysGameFolder("")
+            , m_projectPath("")
            , m_sysDllGame("")
            , m_projectOutputFolder("")
            , m_codeFolder("")
@@ -37,7 +37,7 @@ namespace ProjectSettingsTool
        AZStd::string m_projectName;
        AZStd::string m_productName;
        AZStd::string m_executableName;
-        AZStd::string m_sysGameFolder;
+        AZStd::string m_projectPath;
        AZStd::string m_sysDllGame;
        AZStd::string m_projectOutputFolder;
        AZStd::string m_codeFolder;