Merge from development

Signed-off-by: pereslav <pereslav@amazon.com>
2021-10-08 21:27:55 +01:00
parent 0c2c042fde b7c2401056
commit 08b1529da8
801 changed files with 20452 additions and 13131 deletions
@@ -497,6 +497,8 @@ namespace Multiplayer
        AZ::Interface<AZ::IConsole>::Get()->PerformCommand(commandString.c_str());
        AZ::CVarFixedString loadLevelString = "LoadLevel " + packet.GetMap();
        AZ::Interface<AZ::IConsole>::Get()->PerformCommand(loadLevelString.c_str());
+
+        m_serverAcceptanceReceivedEvent.Signal();
        return true;
    }

@@ -834,6 +836,11 @@ namespace Multiplayer
        handler.Connect(m_connectionAcquiredEvent);
    }

+    void MultiplayerSystemComponent::AddServerAcceptanceReceivedHandler(ServerAcceptanceReceivedEvent::Handler& handler)
+    {
+        handler.Connect(m_serverAcceptanceReceivedEvent);
+    }
+
    void MultiplayerSystemComponent::AddSessionInitHandler(SessionInitEvent::Handler& handler)
    {
        handler.Connect(m_initEvent);