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

Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de

Browse Source 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
This commit is contained in:
Danilo Aimini
2021-07-16 13:21:55 -07:00
parent 57f5e6b2fb 448469025b
commit e9270e491a
50 changed files with 937 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AssetMemoryAnalyzer/gem.json
+1 -1
View File
@@ -6,7 +6,7 @@
"type": "Code",
"summary": "The Asset Memory Analyzer Gem provides tools to profile asset memory usage in Open 3D Engine through ImGUI (Immediate Mode Graphical User Interface).",
"canonical_tags": ["Gem"],
"user_tags": ["Debug", "Utillity", "Tools"],
"user_tags": ["Debug", "Utility", "Tools"],
"icon_path": "preview.png",
"requirements": ""
}
Gems/Atom/CMakeLists.txt
-8
View File
@@ -14,11 +14,3 @@ add_subdirectory(RPI)
add_subdirectory(Tools)
add_subdirectory(Utils)
# The "Atom" Gem will alias the real Atom_AtomBridge target variants
# allows the enabling and disabling the "Atom" Gem to build the pre-requisite dependencies
ly_create_alias(NAME Atom.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Clients)
ly_create_alias(NAME Atom.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Servers)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_create_alias(NAME Atom.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Builders)
ly_create_alias(NAME Atom.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Tools)
endif()
Gems/AtomContent/CMakeLists.txt
+4
View File
@@ -6,3 +6,7 @@
#
add_subdirectory(ReferenceMaterials)
add_subdirectory(Sponza)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_create_alias(NAME AtomContent.Builders NAMESPACE Gem TARGETS Gem::AtomContent_ReferenceMaterials.Builders Gem::AtomContent_Sponza.Builders)
endif()
Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
+15
View File
@@ -115,3 +115,18 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_create_alias(NAME Atom_AtomBridge.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Editor)
ly_create_alias(NAME Atom_AtomBridge.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Editor)
endif()
# The "Atom" Gem will alias the real Atom_AtomBridge target variants
# allows the enabling and disabling the "Atom" Gem to build the pre-requisite dependencies
# The "AtomLyIntegration" Gem will also alias the real Atom_AtomBridge target variants
# The Atom Gem does the same at the moment.
ly_create_alias(NAME Atom.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Clients)
ly_create_alias(NAME Atom.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Servers)
ly_create_alias(NAME AtomLyIntegration.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Clients)
ly_create_alias(NAME AtomLyIntegration.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Servers)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_create_alias(NAME Atom.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Builders)
ly_create_alias(NAME Atom.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Tools)
ly_create_alias(NAME AtomLyIntegration.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Builders)
ly_create_alias(NAME AtomLyIntegration.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Tools)
endif()
Gems/AtomLyIntegration/CMakeLists.txt
-8
View File
@@ -15,11 +15,3 @@ add_subdirectory(AtomBridge)
add_subdirectory(AtomViewportDisplayInfo)
add_subdirectory(AtomViewportDisplayIcons)
# The "AtomLyIntegration" Gem will also alias the real Atom_AtomBridge target variants
# The Atom Gem does the same at the moment.
ly_create_alias(NAME AtomLyIntegration.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Clients)
ly_create_alias(NAME AtomLyIntegration.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Servers)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_create_alias(NAME AtomLyIntegration.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Builders)
ly_create_alias(NAME AtomLyIntegration.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Tools)
endif()
Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt
+2
View File
@@ -57,5 +57,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
PRIVATE
AZ::AzCore
Gem::EMotionFX_Atom.Static
RUNTIME_DEPENDENCIES
Gem::EMotionFX.Editor
)
endif()
Gems/AudioEngineWwise/gem.json
+1 -1
View File
@@ -6,7 +6,7 @@
"type": "Code",
"summary": "The Wwise Audio Engine Gem provides support for Audiokinetic Wave Works Interactive Sound Engine (Wwise).",
"canonical_tags": ["Gem"],
"user_tags": ["Audio", "Utiltity", "Tools"],
"user_tags": ["Audio", "Utility", "Tools"],
"icon_path": "preview.png",
"requirements": "Users will need to download WWise from the AudioKinetic web site: https://www.audiokinetic.com/download/"
}
Gems/AudioSystem/gem.json
+1 -1
View File
@@ -6,7 +6,7 @@
"type": "Code",
"summary": "The Audio System Gem provides the Audio Translation Layer (ATL) and Audio Controls Editor, which add support for audio in Open 3D Engine.",
"canonical_tags": ["Gem"],
"user_tags": ["Audio", "Utiltity", "Tools"],
"user_tags": ["Audio", "Utility", "Tools"],
"icon_path": "preview.png",
"requirements": ""
}
Gems/ExpressionEvaluation/gem.json
+1 -1
View File
@@ -6,7 +6,7 @@
"type": "Code",
"summary": "The Expression Evaluation Gem provides a method for parsing and executing string expressions in Open 3D Engine.",
"canonical_tags": ["Gem"],
"user_tags": ["Scripting", "Utiltity"],
"user_tags": ["Scripting", "Utility"],
"icon_path": "preview.png",
"requirements": ""
}
Gems/GameStateSamples/gem.json
+1 -1
View File
@@ -6,7 +6,7 @@
"type": "Code",
"summary": "The Game State Samples Gem provides a set of sample game states (built on top of the Game State Gem), including primary user selection, main menu, level loading, level running, and level paused.",
"canonical_tags": ["Gem"],
"user_tags": ["Gameplay", "Samples", "Assets"],
"user_tags": ["Gameplay", "Sample", "Assets"],
"icon_path": "preview.png",
"requirements": ""
}
Gems/ScriptCanvas/gem.json
+1 -1
View File
@@ -6,7 +6,7 @@
"type": "Tool",
"summary": "The Script Canvas Gem provides Open 3D Engine's visual scripting environment, Script Canvas.",
"canonical_tags": ["Gem"],
"user_tags": ["Scripting", "Tools", "Utiltiy"],
"user_tags": ["Scripting", "Tools", "Utility"],
"icon_path": "preview.png",
"requirements": ""
}
Gems/SurfaceData/gem.json
+1 -1
View File
@@ -6,7 +6,7 @@
"type": "Code",
"summary": "The Surface Data Gem provides functionality to emit signals or tags from surfaces such as meshes and terrain.",
"canonical_tags": ["Gem"],
"user_tags": ["Environment", "Utiltiy", "Design"],
"user_tags": ["Environment", "Utility", "Design"],
"icon_path": "preview.png",
"requirements": ""
}