Skip to content
Snippets Groups Projects
Commit 7f46cfb1 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

Merge branch 'dev/5.3' into refactor/plugin_separation

# Conflicts:
#	.gitlab-ci.yml
#	Content/Components/Grabbing/BP_GrabComponent.uasset
#	Content/Components/Grabbing/IA_GrabLeft.uasset
#	Content/Components/Grabbing/IA_GrabRight.uasset
#	Content/Components/Movement/IA_Move.uasset
#	Content/Components/Movement/IA_MoveUp.uasset
#	Content/Components/Movement/Turn/IA_DesktopRotation.uasset
#	Content/Components/Movement/Turn/IA_Turn.uasset
#	Content/Components/Raycast/BP_RaycastSelectionComponent.uasset
#	Content/Components/Raycast/IA_RaycastSelectLeft.uasset
#	Content/Components/Raycast/IA_RaycastSelectRight.uasset
#	Content/Components/WidgetInteraction/IA_WidgetClick.uasset
#	Content/Examples/ContentExamples/DemoAssets/BP_GrabbableTestObject.uasset
#	Content/Input/Default_IMC/IMC_General.uasset
#	Content/Input/Default_IMC/IMC_MovementLeftHand.uasset
#	Content/Input/Default_IMC/IMC_MovementRightHand.uasset
#	Content/Pawn/BP_RWTHVRPawn_Default.uasset
#	Content/RWTHVRCluster/CAVEOverlay/IA_ToggleOverlay.uasset
#	Content/TestContent/TestMap.umap
parents 5aff6022 992dab6b
No related branches found
No related tags found
2 merge requests!85UE5.3-2023.1-rc3,!79Plugin Separation: Move the RWTHVRCluster Module into its own Plugin with respective content. Removes Toolkit dependency to nDisplay
Showing
with 21 additions and 2 deletions
...@@ -36,6 +36,8 @@ include: ...@@ -36,6 +36,8 @@ include:
# #
# You can uncomment the deploy lines to deploy your project to the CAVE/VRDev. This only makes sense, if your plugin works # You can uncomment the deploy lines to deploy your project to the CAVE/VRDev. This only makes sense, if your plugin works
# with a generated project. # with a generated project.
#
# Use the UNREAL_VERSION variable to adjust to your preferred Unreal version.
variables: variables:
UNREAL_VERSION: "5.3" UNREAL_VERSION: "5.3"
...@@ -130,12 +132,14 @@ Build_Linux: ...@@ -130,12 +132,14 @@ Build_Linux:
- job: "Generate_Project" - job: "Generate_Project"
artifacts: true artifacts: true
Build_Linux_Without_Cluster:
# Builds for linux without the cluster pluginBuild_Linux_Without_Cluster:
extends: Build_Linux extends: Build_Linux
needs: needs:
- job: "Generate_Project_Without_Cluster" - job: "Generate_Project_Without_Cluster"
artifacts: true artifacts: true
# Deploys to vrdev
Deploy_Windows: Deploy_Windows:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "web"
...@@ -145,6 +149,7 @@ Deploy_Windows: ...@@ -145,6 +149,7 @@ Deploy_Windows:
- job: "Build_Windows" - job: "Build_Windows"
artifacts: true artifacts: true
# Deploys to vrdemo instead of av006de. Use extends: .Deploy_CAVE_ to deploy to legacy av006de
Deploy_CAVE: Deploy_CAVE:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "web"
......
...@@ -5,3 +5,17 @@ ...@@ -5,3 +5,17 @@
+ClassRedirects = (OldName="/Script/RWTHVRToolkit.VRWidgetInteractionComponent",NewName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent") +ClassRedirects = (OldName="/Script/RWTHVRToolkit.VRWidgetInteractionComponent",NewName="/Script/RWTHVRToolkit.RWTHVRWidgetInteractionComponent")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRPawn.PawnMovement",NewName="/Script/RWTHVRToolkit.RWTHVRPawn.CollisionHandlingMovement") +PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRPawn.PawnMovement",NewName="/Script/RWTHVRToolkit.RWTHVRPawn.CollisionHandlingMovement")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRPawn.PawnMovement",NewName="/Script/RWTHVRToolkit.RWTHVRPawn.CollisionHandlingMovement") +PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RWTHVRPawn.PawnMovement",NewName="/Script/RWTHVRToolkit.RWTHVRPawn.CollisionHandlingMovement")
+ClassRedirects = (OldName="/Script/RWTHVRToolkit.RaycastSelectionComponent",NewName="/Script/RWTHVRToolkit.RaycastInteractionComponent")
+ClassRedirects = (OldName="/Script/RWTHVRToolkit.GrabComponent",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent")
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.RaycastInteractionComponent.OnBeginSelect",NewName="/Script/RWTHVRToolkit.RaycastInteractionComponent.OnBeginInteraction")
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.RaycastInteractionComponent.OnEndSelect",NewName="/Script/RWTHVRToolkit.RaycastInteractionComponent.OnEndInteraction")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RaycastInteractionComponent.RayCastSelectInputAction",NewName="/Script/RWTHVRToolkit.RaycastInteractionComponent.RayCastInteractionInputAction")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.RaycastInteractionComponent.RayCastInteractionInputAction",NewName="/Script/RWTHVRToolkit.RaycastInteractionComponent.InteractionInputAction")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousGrabbablesInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousInteractableComponentsInRange")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.GrabInputAction",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.InteractionInputAction")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.GrabSphereRadius",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.InteractionSphereRadius")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.bOnlyGrabClosestActor",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.bOnlyInteractWithClosestActor")
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnBeginGrab",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnBeginInteraction")
+FunctionRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndGrab",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.OnEndInteraction")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.PreviousInteractableComponentsInRange")
+PropertyRedirects = (OldName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentGrabBehavioursInRange",NewName="/Script/RWTHVRToolkit.DirectInteractionComponent.CurrentInteractableComponentsInRange")
\ No newline at end of file
File added
File added
File deleted
File deleted
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
File deleted
File deleted
File added
File added
No preview for this file type
File added
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment