Merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-27 15:50:22 -07:00
parent 95d7cc7212 527508ce66
commit 0a829f9661
482 changed files with 10637 additions and 2735 deletions
@@ -123,6 +123,8 @@ namespace Multiplayer
        INetworkEntityManager* GetNetworkEntityManager() override;
        void SetFilterEntityManager(IFilterEntityManager* entityFilter) override;
        IFilterEntityManager* GetFilterEntityManager() override;
+        void SetShouldSpawnNetworkEntities(bool value) override;
+        bool GetShouldSpawnNetworkEntities() const override;
        //! @}

        //! Console commands.
@@ -167,6 +169,7 @@ namespace Multiplayer
        float m_renderBlendFactor = 0.0f;
        float m_tickFactor = 0.0f;
        bool m_didHandshake = false;
+        bool m_spawnNetboundEntities = true;

 #if !defined(AZ_RELEASE_BUILD)
        MultiplayerEditorConnection m_editorConnectionListener;