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
Branches
Tags
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
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 0 deletions
Content/Examples/ContentExamples/Pawns/BP_TeleportPawn.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/ToolkitExamples.umap 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Trigger/ContinuousNavigationModeTrigger.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Trigger/InteractionTechniqueSwapTrigger.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Trigger/InteractionTechniquesEnum.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Trigger/MovementTechniqueSwapTrigger.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Widgets/BP_PawnSwapWidgetActor.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Widgets/BP_WidgetDemoActor.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Widgets/ClickMeWidget.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Widgets/DemostationTextboxWidget.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ContentExamples/Widgets/PawnSwapButtonWidget.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Blueprints/BP_RE_1_1.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Blueprints/BP_RE_1_2.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Blueprints/BP_RE_1_3.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Blueprints/BP_RE_1_4.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Blueprints/BP_RE_1_5.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Blueprints/BP_loc_NoReplication.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Blueprints/BP_loc_replication.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Blueprints/BP_locomotive.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
Content/Examples/ReplicationExamples/Models/BP_locomotiveAnimation.uasset 0 → 100644
+ 0
− 0
View file @ 7f46cfb1
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment