Merge main to Multiplayer Editor branch

2021-04-14 16:25:53 -07:00
parent fa781fabc5 b5386fd53b
commit d1a65c8dc4
2668 changed files with 45469 additions and 543976 deletions
@@ -13,6 +13,8 @@
 #include <Source/Multiplayer_precompiled.h>
 #include <Source/MultiplayerGem.h>
 #include <Source/MultiplayerSystemComponent.h>
+#include <Source/Components/NetBindComponent.h>
+#include <Source/AutoGen/AutoComponentTypes.h>
 #include <AzNetworking/Framework/NetworkingSystemComponent.h>

 #ifdef MULTIPLAYER_EDITOR
@@ -27,10 +29,14 @@ namespace Multiplayer
        m_descriptors.insert(m_descriptors.end(), {
            AzNetworking::NetworkingSystemComponent::CreateDescriptor(),
            MultiplayerSystemComponent::CreateDescriptor(),
+            NetBindComponent::CreateDescriptor(),
 #ifdef MULTIPLAYER_EDITOR
            MultiplayerEditorSystemComponent::CreateDescriptor(),
 #endif
        });
+
+        CreateComponentDescriptors(m_descriptors);
+        });
    }

    AZ::ComponentTypeList MultiplayerModule::GetRequiredSystemComponents() const