Merge main to mpgem_editor

2021-04-22 17:51:30 -07:00
parent 0a1f0f5698 bac334a244
commit 0ddf6cd6d2
1102 changed files with 31647 additions and 34057 deletions
@@ -15,6 +15,8 @@
 #include <Source/MultiplayerSystemComponent.h>
 #include <Source/Components/NetBindComponent.h>
 #include <Source/AutoGen/AutoComponentTypes.h>
+#include <Source/Pipeline/NetBindMarkerComponent.h>
+#include <Source/Pipeline/NetworkSpawnableHolderComponent.h>
 #include <AzNetworking/Framework/NetworkingSystemComponent.h>

 #ifdef MULTIPLAYER_EDITOR
@@ -33,6 +35,8 @@ namespace Multiplayer
 #ifdef MULTIPLAYER_EDITOR
            MultiplayerEditorSystemComponent::CreateDescriptor(),
 #endif
+            NetBindMarkerComponent::CreateDescriptor(),
+            NetworkSpawnableHolderComponent::CreateDescriptor(),
        });

        CreateComponentDescriptors(m_descriptors);