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

2021-07-20 14:13:24 -07:00
parent 07a1af99ba 92571c2ae4
commit 52780f2130
2202 changed files with 18110 additions and 156389 deletions
@@ -660,6 +660,7 @@ namespace Multiplayer

            AZStd::unique_ptr<IReplicationWindow> window = AZStd::make_unique<NullReplicationWindow>();
            reinterpret_cast<ClientToServerConnectionData*>(connection->GetUserData())->GetReplicationManager().SetEntityActivationTimeSliceMs(cl_defaultNetworkEntityActivationTimeSliceMs);
+            reinterpret_cast<ClientToServerConnectionData*>(connection->GetUserData())->GetReplicationManager().SetReplicationWindow(AZStd::move(window));
        }
    }