Merge branch 'develop' into 'master'

Develop

See merge request VR-Group/unreal-development/unrealprojecttemplate!26

.gitlab-ci.yml

@@ -7,7 +7,7 @@
 #Reference the Gitlab CI website for this
 
 include:
-  - project: 'vr-group/gitlab-ci-unreal-files'
+  - project: 'vr-group/unreal-development/unreal-ci'
     ref: master 
     file: '/shared_scripts.yml'
     

.gitmodules

 [submodule "Plugins/nDisplayExtensions"]
 	path = Plugins/nDisplayExtensions
-	url = https://devhub.vr.rwth-aachen.de/VR-Group/ndisplayextensions.git
-	branch = develop-4-22
+	url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/ndisplayextensions.git
 [submodule "Plugins/CaveOverlay"]
 	path = Plugins/CaveOverlay
-	url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-cave-overlay.git
+	url = https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unreal-cave-overlay.git

Config/DefaultEngine.ini

@@ -13,8 +13,8 @@ GlobalDefaultGameMode=/Script/DisplayClusterExtensions.VirtualRealityGameMode
 GameEngine=/Script/DisplayCluster.DisplayClusterGameEngine
 UnrealEdEngine=/Script/DisplayClusterEditor.DisplayClusterEditorEngine
 
-+ActiveGameNameRedirects=(OldGameName="TP_nDisplayBP",NewGameName="/Script/template")
-+ActiveGameNameRedirects=(OldGameName="/Script/TP_nDisplayBP",NewGameName="/Script/template")
++ActiveGameNameRedirects=(OldGameName="TP_nDisplayBP",NewGameName="/Script/RwthVrTemplate")
++ActiveGameNameRedirects=(OldGameName="/Script/TP_nDisplayBP",NewGameName="/Script/RwthVrTemplate")
 
 [/Script/DisplayClusterEditor.DisplayClusterEditorSettings]
 bEnabled=True

Config/DefaultGame.ini

 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=6F40C2084FB7D1EAFCAEF3B2C978D28C
-ProjectName=template
+ProjectName=RwthVrTemplate
 bUseBorderlessWindow=True

template.uproject → RwthVrTemplate.uproject

@@ -5,7 +5,7 @@
 	"Description": "",
 	"Modules": [
 		{
-			"Name": "template",
+			"Name": "RwthVrTemplate",
 			"Type": "Runtime",
 			"LoadingPhase": "Default",
 			"AdditionalDependencies": [

Source/template.Target.cs → Source/RwthVrTemplate.Target.cs

@@ -3,12 +3,12 @@
 using UnrealBuildTool;
 using System.Collections.Generic;
 
-public class templateTarget : TargetRules
+public class RwthVrTemplateTarget : TargetRules
 {
-	public templateTarget(TargetInfo Target) : base(Target)
+	public RwthVrTemplateTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Game;
 
-		ExtraModuleNames.AddRange( new string[] { "template" } );
+		ExtraModuleNames.AddRange( new string[] { "RwthVrTemplate" } );
 	}
 }

Source/template/template.Build.cs → Source/RwthVrTemplate/RwthVrTemplate.Build.cs

@@ -2,9 +2,9 @@
 
 using UnrealBuildTool;
 
-public class template : ModuleRules
+public class RwthVrTemplate : ModuleRules
 {
-	public template(ReadOnlyTargetRules Target) : base(Target)
+	public RwthVrTemplate(ReadOnlyTargetRules Target) : base(Target)
 	{
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 	

Source/RwthVrTemplate/RwthVrTemplate.cpp

+#include "RwthVrTemplate.h"
+#include "Modules/ModuleManager.h"
+
+IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, RwthVrTemplate, "RwthVrTemplate" );

Source/template/nothing.h → Source/RwthVrTemplate/nothing.h

@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 
-class TEMPLATE_API nothing
+class RWTHVRTEMPLATE_API nothing
 {
 public:
 	nothing();

Source/templateEditor.Target.cs → Source/RwthVrTemplateEditor.Target.cs

@@ -3,12 +3,12 @@
 using UnrealBuildTool;
 using System.Collections.Generic;
 
-public class templateEditorTarget : TargetRules
+public class RwthVrTemplateEditorTarget : TargetRules
 {
-	public templateEditorTarget(TargetInfo Target) : base(Target)
+	public RwthVrTemplateEditorTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Editor;
 
-		ExtraModuleNames.AddRange( new string[] { "template" } );
+		ExtraModuleNames.AddRange( new string[] { "RwthVrTemplate" } );
 	}
 }

Source/template/template.cpp

-#include "template.h"
-#include "Modules/ModuleManager.h"
-
-IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, template, "template" );