Merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-04 16:59:57 -07:00
parent c1c8709206 678c9a9fe9
commit eb2470fe38
383 changed files with 125811 additions and 1674 deletions
@@ -50,7 +50,7 @@ namespace Multiplayer
        void OnDeactivate(Multiplayer::EntityIsMigrating entityIsMigrating) override;

    private:
-        void OnTransformChangedEvent(const AZ::Transform& worldTm);
+        void OnTransformChangedEvent(const AZ::Transform& localTm, const AZ::Transform& worldTm);
        void OnParentIdChangedEvent(AZ::EntityId oldParent, AZ::EntityId newParent);

        AZ::TransformChangedEvent::Handler m_transformChangedHandler;