Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-07-02 16:29:27 -05:00
119 changed files with 1006 additions and 1506 deletions
+7 -5
View File
@@ -1,10 +1,12 @@
{
"gem_name": "MultiplayerCompression",
"display_name": "Multiplayer Compression",
"summary": "The Multiplayer Compression gem provides an open source Compressor for use with AzNetworking's transport layer.",
"canonical_tags": ["Multiplayer", "Networking", "Utility"],
"user_tags": ["MultiplayerCompression"],
"icon_path": "preview.png",
"license": "Apache-2.0 Or MIT",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"provider": "Open 3D Foundation"
"summary": "The Multiplayer Compression Gem provides an open source Compressor for use with AzNetworking's transport layer.",
"canonical_tags": ["Gem"],
"user_tags": ["Multiplayer", "Network", "Utility"],
"icon_path": "preview.png",
"requirements": ""
}