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,25 +1,12 @@
 {
    "gem_name": "MessagePopup",
-    "GemFormatVersion": 4,
-    "Uuid": "89225422672547deaca9e7a22b883973",
-    "Name": "MessagePopup",
-    "DisplayName": "MessagePopup",
-    "Version": "0.1.0",
-    "Summary": "Show a message popup ",
-    "Tags": ["Untagged"],
-    "IconPath": "preview.png",
-    "Dependencies": [
-        {
-            "Uuid": "6bb61c9e547043f0afc5019d6d460b78",
-            "VersionConstraints": [
-                "~>0.1.0"
-            ],
-            "_comment": "UiBasics"
-        }
-    ],
-    "Modules": [
-        {
-            "Type": "GameModule"
-        }
-    ]
+    "display_name": "Message Popup",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Code",
+    "summary": "The Message Popup Gem provides an example implementation of popup messages using LyShine in Open 3D Engine.",
+    "canonical_tags": ["Gem"],
+    "user_tags": ["Gameplay", "Sample"],
+    "icon_path": "preview.png",
+    "requirements": ""
 }