Merging from development

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-07 12:35:41 -08:00
parent b1eeebb6b6
commit cd5306febf
334 changed files with 9946 additions and 3757 deletions
@@ -25,13 +25,16 @@ namespace O3DE::ProjectManager
        QString m_name;
        QString m_thirdPartyPath;

-        // from o3de_manifest.json
        QString m_path;
+
+        // from o3de_manifest.json
        QString m_defaultProjectsFolder;
        QString m_defaultGemsFolder;
        QString m_defaultTemplatesFolder;
        QString m_defaultRestrictedFolder;

+        bool m_registered = false;
+
        bool IsValid() const;
    };
 } // namespace O3DE::ProjectManager