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,30 +1,12 @@
 {
    "gem_name": "SurfaceData",
-    "GemFormatVersion": 4,
-    "Uuid": "5de82d29d6094bfe97c1a4d35fcd5fbe",
-    "Name": "SurfaceData",
-    "DisplayName": "Surface Data [PREVIEW]",
-    "Version": "0.1.0",
-    "Summary": "A Lumberyard Gem that allows you to attach user-defined tags to surfaces and volumes, and fetch data like positions, normals, and tags for those surfaces.",
-    "Tags": ["Surface", "Geometry", "Tags"],
-    "IconPath": "preview.png",
-    "Modules": [
-        {
-            "Type": "GameModule"
-        },
-        {
-            "Name": "Editor",
-            "Type": "EditorModule",
-            "Extends": "GameModule"
-        }
-    ],
-    "Dependencies": [
-        {
-            "Uuid": "ff06785f7145416b9d46fde39098cb0c",
-            "VersionConstraints": [
-                "~>0.1"
-            ],
-            "_comment": "LmbrCentral"
-        }
-    ]
+    "display_name": "Surface Data",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Code",
+    "summary": "The Surface Data Gem provides functionality to emit signals or tags from surfaces such as meshes and terrain.",
+    "canonical_tags": ["Gem"],
+    "user_tags": ["Environment", "Utiltiy", "Design"],
+    "icon_path": "preview.png",
+    "requirements": ""
 }