Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
@@ -5,8 +5,15 @@
|
||||
"origin": "https://github.com/aws-lumberyard-dev/o3de.git",
|
||||
"type": "Asset",
|
||||
"summary": "Atom Asset Gem with a library of reference materials for StandardPBR (and others in the future)",
|
||||
"canonical_tags": ["Gem"],
|
||||
"user_tags": ["Assets", "PBR", "Materials"],
|
||||
"canonical_tags": [
|
||||
"Gem"
|
||||
],
|
||||
"user_tags": [
|
||||
"Assets",
|
||||
"PBR",
|
||||
"Materials"
|
||||
],
|
||||
"icon_path": "preview.png",
|
||||
"dependencies": []
|
||||
"dependencies": [],
|
||||
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt"
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"gem_name": "Sponza",
|
||||
"display_name": "Sponza",
|
||||
"license": "Apache-2.0 Or MIT",
|
||||
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
|
||||
"origin": "Open 3D Engine - o3de.org",
|
||||
"type": "Asset",
|
||||
"summary": "A standard test scene for Global Illumination (forked from crytek sponza scene)",
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"gem_name": "AtomContent",
|
||||
"display_name": "Atom Content",
|
||||
"license": "Apache-2.0 Or MIT",
|
||||
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
|
||||
"origin": "Open 3D Engine - o3de.org",
|
||||
"type": "Asset",
|
||||
"summary": "The Atom Content Gem provides assets for Atom Renderer and a modified version of the <a href='https://renderman.pixar.com/look-development-studio'>Pixar Look Development Studio</a>.",
|
||||
|
||||
Reference in New Issue
Block a user