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,17 +1,12 @@
 {
    "gem_name": "TextureAtlas",
-    "GemFormatVersion": 4,
-    "Uuid": "5a149b6b3c964064bd4970f0e92f72e2",
-    "Name": "TextureAtlas",
-    "DisplayName": "Texture Atlas",
-    "Version": "0.1.0",
-    "Summary": "Includes the formatting for Texture Atlases",
-    "Tags": ["Required", "Asset Processor Builder", "Texture Atlas"],
-    "IconPath": "preview.png",
-    "IsRequired": true,
-    "Modules": [
-        {
-            "Type": "GameModule"
-        }
-    ]
+    "display_name": "Texture Atlas",
+    "license": "Apache-2.0 Or MIT",
+    "origin": "Open 3D Engine - o3de.org",
+    "type": "Code",
+    "summary": "The Texture Atlas Gem provides the formatting for texture atlases from 2D textures for LyShine.",
+    "canonical_tags": ["Gem"],
+    "user_tags": ["Rendering", "Assets", "Utility"],
+    "icon_path": "preview.png",
+    "requirements": ""
 }