Merged dev

Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-22 08:09:53 -04:00
parent 5f73061227 35517c4e6a
commit cb75607106
149 changed files with 1952 additions and 659 deletions
@@ -13,7 +13,6 @@
 #include <Source/MultiplayerGem.h>
 #include <Source/MultiplayerSystemComponent.h>
 #include <Source/AutoGen/AutoComponentTypes.h>
-#include <Source/Pipeline/NetBindMarkerComponent.h>
 #include <Source/Pipeline/NetworkSpawnableHolderComponent.h>

 namespace Multiplayer
@@ -25,7 +24,6 @@ namespace Multiplayer
            AzNetworking::NetworkingSystemComponent::CreateDescriptor(),
            MultiplayerSystemComponent::CreateDescriptor(),
            NetBindComponent::CreateDescriptor(),
-            NetBindMarkerComponent::CreateDescriptor(),
            NetworkSpawnableHolderComponent::CreateDescriptor(),
        });