Merge latest to mp_handshake_conndata

Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-10-04 13:58:09 -07:00
parent a18655e8f7 5acb360fbb
commit 170a32d667
564 changed files with 128361 additions and 4655 deletions
@@ -9,7 +9,7 @@
 #pragma once

 #include <Multiplayer/ConnectionData/IConnectionData.h>
-#include <Source/NetworkEntity/EntityReplication/EntityReplicationManager.h>
+#include <Multiplayer/NetworkEntity/EntityReplication/EntityReplicationManager.h>

 namespace Multiplayer
 {
@@ -30,7 +30,7 @@ namespace Multiplayer
        ConnectionDataType GetConnectionDataType() const override;
        AzNetworking::IConnection* GetConnection() const override;
        EntityReplicationManager& GetReplicationManager() override;
-        void Update(AZ::TimeMs hostTimeMs) override;
+        void Update() override;
        bool CanSendUpdates() const override;
        void SetCanSendUpdates(bool canSendUpdates) override;
        bool DidHandshake() const override;