birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch stabilization/2110 into development

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-11-04 13:44:22 -07:00
parent 5a0b5f9f8b 4721ef8298
commit d942c90c56
118 changed files with 285 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/AtomBridge/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "Atom_AtomBridge",
"display_name": "Atom Bridge",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "",
Gems/AtomLyIntegration/AtomFont/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "AtomFont",
"display_name": "Atom Font",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "",
Gems/AtomLyIntegration/AtomImGuiTools/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "AtomImGuiTools",
"display_name": "Atom ImGui",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Tool",
"summary": "",
Gems/AtomLyIntegration/AtomViewportDisplayIcons/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "AtomViewportDisplayIcons",
"display_name": "Atom Viewport Display Icons",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "",
Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "AtomViewportDisplayInfo",
"display_name": "Atom Viewport Display Info",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "",
Gems/AtomLyIntegration/CommonFeatures/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "CommonFeaturesAtom",
"display_name": "Common Features Atom",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "",
Gems/AtomLyIntegration/EMotionFXAtom/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "EMotionFX_Atom",
"display_name": "EMotionFX Atom",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "",
Gems/AtomLyIntegration/ImguiAtom/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "ImguiAtom",
"display_name": "Imgui Atom",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "",
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
+1
View File
@@ -3,6 +3,7 @@
"display_name": "Atom DccScriptingInterface (DCCsi)",
"summary": "A python framework for working with various DCC tools and workflows.",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"canonical_tags": [
Gems/AtomLyIntegration/gem.json
+1
View File
@@ -2,6 +2,7 @@
"gem_name": "AtomLyIntegration",
"display_name": "Atom O3DE Integration",
"license": "Apache-2.0 Or MIT",
"license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
"origin": "Open 3D Engine - o3de.org",
"type": "Code",
"summary": "The Atom O3DE Integration Gem provides components, libraries, and functionality to support and integrate Atom Renderer in Open 3D Engine.",