Merge branch 'development' into Prefab/DestroyGameEntitySupport

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
This commit is contained in:
srikappa-amzn
2021-09-28 06:57:38 -07:00
1501 changed files with 34384 additions and 17743 deletions
@@ -105,7 +105,7 @@ namespace AzFramework
virtual AZ::Matrix3x4 PopPremultipliedMatrix() { return AZ::Matrix3x4::CreateIdentity(); }
protected:
~DebugDisplayRequests() = default;
virtual ~DebugDisplayRequests() = default;
};
/// Inherit from DebugDisplayRequestBus::Handler to implement the DebugDisplayRequests interface.
@@ -69,7 +69,7 @@ namespace AzFramework
// EntityContext
AZ::Entity* CreateEntity(const char* name) override;
void OnRootEntityReloaded() override;
void OnContextEntitiesAdded(const EntityList& entities);
void OnContextEntitiesAdded(const EntityList& entities) override;
void OnContextReset() override;
bool ValidateEntitiesAreValidForContext(const EntityList& entities) override;
//////////////////////////////////////////////////////////////////////////