Merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-14 19:17:10 -07:00
parent a6e7a81b79 16e60a94af
commit 3040f74c41
1528 changed files with 33581 additions and 22343 deletions
@@ -33,6 +33,8 @@ namespace Multiplayer
        void Update() override;
        bool CanSendUpdates() const override;
        void SetCanSendUpdates(bool canSendUpdates) override;
+        bool DidHandshake() const override;
+        void SetDidHandshake(bool didHandshake) override;
        //! @}

        const AZStd::string& GetProviderTicket() const;
@@ -43,6 +45,7 @@ namespace Multiplayer
        AZStd::string m_providerTicket;
        AzNetworking::IConnection* m_connection = nullptr;
        bool m_canSendUpdates = true;
+        bool m_didHandshake = false;
    };
 }

@@ -27,4 +27,14 @@ namespace Multiplayer
    {
        m_providerTicket = ticket;
    }
+
+    inline bool ClientToServerConnectionData::DidHandshake() const
+    {
+        return m_didHandshake;
+    }
+
+    inline void ClientToServerConnectionData::SetDidHandshake(bool didHandshake)
+    {
+        m_didHandshake = didHandshake;
+    }
 }
@@ -34,6 +34,8 @@ namespace Multiplayer
        void Update() override;
        bool CanSendUpdates() const override;
        void SetCanSendUpdates(bool canSendUpdates) override;
+        bool DidHandshake() const override;
+        void SetDidHandshake(bool didHandshake) override;
        //! @}

        NetworkEntityHandle GetPrimaryPlayerEntity();
@@ -53,6 +55,7 @@ namespace Multiplayer
        AZStd::string m_providerTicket;
        AzNetworking::IConnection* m_connection = nullptr;
        bool m_canSendUpdates = false;
+        bool m_didHandshake = false;
    };
 }

@@ -37,4 +37,14 @@ namespace Multiplayer
    {
        m_providerTicket = ticket;
    }
+
+    inline bool ServerToClientConnectionData::DidHandshake() const
+    {
+        return m_didHandshake;
+    }
+
+    inline void ServerToClientConnectionData::SetDidHandshake(bool didHandshake)
+    {
+        m_didHandshake = didHandshake;
+    }
 }