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 <AzTest/GemTestEnvironment.h>
 #include <QApplication>
 #include <Multiplayer/Components/NetBindComponent.h>
-#include <Source/Pipeline/NetBindMarkerComponent.h>
 #include <Source/Pipeline/NetworkSpawnableHolderComponent.h>
 #include <UnitTest/ToolsTestApplication.h>

@@ -30,7 +29,6 @@ namespace Multiplayer
        {
            AZStd::vector<AZ::ComponentDescriptor*> descriptors({
                NetBindComponent::CreateDescriptor(),
-                NetBindMarkerComponent::CreateDescriptor(),
                NetworkSpawnableHolderComponent::CreateDescriptor()
            });