Merge branch 'development' of https://github.com/o3de/o3de into NetHierarchyInput

2021-10-02 23:46:17 +01:00
parent ef3552df69 7dc5c8be61
commit 64068991ed
318 changed files with 7108 additions and 5331 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;