Merging latest dev

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-10 19:41:36 -08:00
parent d6803d800b 9b393d16fe
commit fe5aeb9a5f
549 changed files with 10586 additions and 4619 deletions
@@ -153,7 +153,6 @@ namespace Multiplayer
        AZ_CONSOLEFUNC(MultiplayerSystemComponent, DumpStats, AZ::ConsoleFunctorFlags::Null, "Dumps stats for the current multiplayer session");

        AzNetworking::INetworkInterface* m_networkInterface = nullptr;
-        AzNetworking::INetworkInterface* m_networkEditorInterface = nullptr;
        AZ::ConsoleCommandInvokedEvent::Handler m_consoleCommandHandler;
        AZ::ThreadSafeDeque<AZStd::string> m_cvarCommands;