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

Merge branch 'dev/5.3' into refactor/plugin_separation
7f46cfb1 · David Gilbert · 5aff6022 · 992dab6b · 7f46cfb1 · 7f46cfb1
Commit 7f46cfb1 authored Mar 15, 2024 by David Gilbert
--- a/Content/Examples/ContentExamples/DemoRoomAssets/BP_DemoRoom.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/BP_DemoRoom.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/BP_Demostation.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/BP_Demostation.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_back_piller.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_back_piller.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_connector.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_connector.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_floor.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_floor.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_front_pillar.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_front_pillar.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_long_wall.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_long_wall.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_short_wall.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_short_wall.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_vertical_end_piller.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomAssets_vertical_end_piller.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomTest.umap
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/DemoRoomTest.umap
--- a/Content/Examples/ContentExamples/DemoRoomAssets/Entrance_Pillars.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/Entrance_Pillars.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/Floor.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/Floor.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/Frame.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/Frame.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/Inner_Walls.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/Inner_Walls.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/Interior.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/Interior.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/Outer_Pillars.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/Outer_Pillars.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/Outer_Walls.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/Outer_Walls.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/S_RoomSettings.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/S_RoomSettings.uasset
--- a/Content/Examples/ContentExamples/DemoRoomAssets/demostation.uasset
+++ b/Content/Examples/ContentExamples/DemoRoomAssets/demostation.uasset
--- a/Content/Examples/ContentExamples/Pawns/BP_ContentExamplesPawn.uasset
+++ b/Content/Examples/ContentExamples/Pawns/BP_ContentExamplesPawn.uasset