Integrating latest from github/staging

Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -3,15 +3,45 @@
{
"Gems":
{
"AutomatedTesting.Assets":
"DevTextures":
{
"SourcePaths":
[
"Gems/DevTextures"
]
},
"PBSreferenceMaterials":
{
"SourcePaths":
[
"Gems/PBSreferenceMaterials"
]
},
"PhysicsEntities":
{
"SourcePaths":
[
"Gems/PhysicsEntities"
]
},
"PhysXSamples":
{
"SourcePaths":
[
"Gems/PhysXSamples"
]
},
"PrimitiveAssets":
{
"SourcePaths":
[
"Gems/PrimitiveAssets"
]
},
"UiBasics":
{
"SourcePaths":
[
"Gems/DevTextures",
"Gems/PBSreferenceMaterials",
"Gems/PhysicsEntities",
"Gems/PhysXSamples",
"Gems/PrimitiveAssets",
"Gems/UiBasics"
]
}