Merging last dev

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-19 23:12:59 -08:00
parent e1ace4a8f6 7100d48e16
commit 6005a4e08b
2657 changed files with 249197 additions and 30535 deletions
@@ -176,7 +176,7 @@ namespace Multiplayer
        AZStd::queue<AZStd::string> m_pendingConnectionTickets;
        AZStd::unordered_map<uint64_t, NetEntityId> m_playerRejoinData;

-        AZ::TimeMs m_lastReplicatedHostTimeMs = AZ::TimeMs{ 0 };
+        AZ::TimeMs m_lastReplicatedHostTimeMs = AZ::Time::ZeroTimeMs;
        HostFrameId m_lastReplicatedHostFrameId = HostFrameId(0);

        uint64_t m_temporaryUserIdentifier = 0; // Used in the event of a migration or rejoin