merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-20 13:27:45 -07:00
parent 6e84495975 df9b0714a4
commit 8401ee409b
1363 changed files with 53344 additions and 47766 deletions
@@ -153,6 +153,7 @@ namespace Multiplayer
        {
        public:
            OrphanedEntityRpcs(EntityReplicationManager& replicationManager);
+            virtual ~OrphanedEntityRpcs() = default;
            void Update();
            bool DispatchOrphanedRpcs(EntityReplicator& entityReplicator);
            void AddOrphanedRpc(NetEntityId entityId, NetworkEntityRpcMessage& entityRpcMessage);
@@ -291,8 +291,6 @@ namespace Multiplayer

    void NetworkEntityManager::RemoveEntities()
    {
-        //RewindableObjectState::ClearRewoundEntities();
-
        AZStd::vector<NetEntityId> removeList;
        removeList.swap(m_removeList);
        for (NetEntityId entityId : removeList)