Merge branch 'development' into Prefabs/ProcessStackAddPrefabBug

Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp

@@ -39,8 +39,8 @@ namespace Multiplayer
                     "Network Binding", "The Network Binding component marks an entity as able to be replicated across the network")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Multiplayer")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NetBind.png")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NetBind.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NetBinding.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NetBinding.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
             }
         }

Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp

@@ -41,6 +41,12 @@ namespace Multiplayer
         // Automated testing listens for these logs
         if (editorsv_isDedicated)
         {
+            // Server logs will be piped to the editor so turn off buffering,
+            // otherwise it'll take a lot of logs to fill up the buffer before stdout is finally flushed.
+            // This isn't optimal, but will only affect editor-servers (used when testing multiplayer levels in Editor gameplay mode) and not production servers.
+            // Note: _IOLBF (flush on newlines) won't work for Automated Testing which uses a headless server app and will fall back to _IOFBF (full buffering)
+            setvbuf(stdout, NULL, _IONBF, 0);
+
             // If the settings registry is not available at this point,
             // then something catastrophic has happened in the application startup.
             // That should have been caught and messaged out earlier in startup.
@@ -235,5 +241,4 @@ namespace Multiplayer
     {
         return MultiplayerEditorPackets::DispatchPacket(connection, packetHeader, serializer, *this);
     }
-    
 }

Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h

@@ -12,6 +12,7 @@
 #include <AzCore/IO/ByteContainerStream.h>
 #include <AzNetworking/ConnectionLayer/IConnectionListener.h>
 #include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/Component/TickBus.h>
 
 namespace AzNetworking
 {