Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
@@ -1,12 +1,12 @@
 {
    "gem_name": "SceneLoggingExample",
-    "GemFormatVersion": 3,
-    "Uuid": "35d8f6e49ae04c9382c61a42d4355c2f",
-    "Name": "SceneLoggingExample",
-    "DisplayName": "Scene Logging Example",
-    "Version": "0.1.0",
-    "LinkType": "Dynamic",
-    "Summary": "This example Gem demonstrates the basics of extending the SceneAPI by adding additional logging to the pipeline. Please read ReadMe.txt for further details.",
-    "Tags": ["Scene", "FBX"],
-    "IconPath": "preview.png"
-}
+    "display_name": "Scene Logging Example",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Asset",
+    "summary": "The Scene Logging Example Gem demonstrates the basics of extending the Open 3D Engine Scene API by adding additional logging to the pipeline.",
+    "canonical_tags": ["Gem"],
+    "user_tags": ["Debug", "Sample"],
+    "icon_path": "preview.png",
+    "requirements": ""
+  }