Merge branch 'dev/5.4' into 'dev/5.5'

Pull 5.4 changes into 5.5

See merge request !6

.gitlab-ci.yml

@@ -41,7 +41,6 @@ include:
 
 variables:
     UNREAL_VERSION: "5.5"
-    CUSTOM_NDISPLAY_CONFIG: "aixcave_5_3_dev.ndisplay"
 
 stages:
   - analyze

Source/RWTHVRCluster/Private/RWTHVRCluster.cpp

 #include "RWTHVRCluster.h"
 
+
+#include "GameDelegates.h"
+#include "Logging/StructuredLog.h"
+
 #define LOCTEXT_NAMESPACE "FRWTHVRClusterModule"
 
-void FRWTHVRClusterModule::StartupModule() { ClusterConsole.Register(); }
+void FRWTHVRClusterModule::StartupModule()
+{
+	ClusterConsole.Register();
+
+	FGameDelegates::Get().GetModifyCookDelegate().AddRaw(this, &FRWTHVRClusterModule::GetPackagesToAlwaysCook);
+}
 
 void FRWTHVRClusterModule::ShutdownModule() { ClusterConsole.Unregister(); }
 
+void FRWTHVRClusterModule::GetPackagesToAlwaysCook(TConstArrayView<const ITargetPlatform*> InTargetPlatforms,
+												   TArray<FName>& InOutPackagesToCook,
+												   TArray<FName>& InOutPackagesToNeverCook)
+{
+	InOutPackagesToCook.Add("/RWTHVRCluster/Config/aixcave");
+	InOutPackagesToCook.Add("/RWTHVRCluster/Config/aixcave_two_player");
+
+	UE_LOGFMT(LogTemp, Display,
+			  "GetPackagesToAlwaysCook delegate called, adding aixcave configs to always cook list...");
+}
+
 #undef LOCTEXT_NAMESPACE
 
 IMPLEMENT_MODULE(FRWTHVRClusterModule, RWTHVRCluster)

Source/RWTHVRCluster/Public/RWTHVRCluster.h

@@ -10,6 +10,9 @@ public:
 	virtual void StartupModule() override;
 	virtual void ShutdownModule() override;
 
+	void GetPackagesToAlwaysCook(TConstArrayView<const ITargetPlatform*> InTargetPlatforms,
+								 TArray<FName>& InOutPackagesToCook, TArray<FName>& InOutPackagesToNeverCook);
+
 private:
 	FClusterConsole ClusterConsole;
 };