Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
@@ -114,6 +114,8 @@ namespace Multiplayer
        AZ::TimeMs GetCurrentHostTimeMs() const override;
        INetworkTime* GetNetworkTime() override;
        INetworkEntityManager* GetNetworkEntityManager() override;
+        void SetFilterEntityManager(IFilterEntityManager* entityFilter) override;
+        IFilterEntityManager* GetFilterEntityManager() override;
        //! @}

        //! Console commands.
@@ -138,6 +140,8 @@ namespace Multiplayer
        NetworkEntityManager m_networkEntityManager;
        NetworkTime m_networkTime;
        MultiplayerAgentType m_agentType = MultiplayerAgentType::Uninitialized;
+        
+        IFilterEntityManager* m_filterEntityManager = nullptr; // non-owning pointer

        SessionInitEvent m_initEvent;
        SessionShutdownEvent m_shutdownEvent;