Merge

Grab dif project
2022-03-07 18:48:11 +02:00 · 2022-03-07 18:47:54 +02:00
10 changed files with 22 additions and 12 deletions
--- a/Config/DefaultInput.ini
+++ b/Config/DefaultInput.ini
@@ -185,6 +185,7 @@ DoubleClickTime=0.200000
 +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=MixedReality_Right_Thumbstick_Y)
 +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=Vive_Right_Trackpad_Y)
 +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=OculusTouch_Right_A_Click)
 +AxisMappings=(AxisName="TeleportationAxis",Scale=1.000000,Key=OculusTouch_Right_A_Click)
 DefaultPlayerInputClass=/Script/Engine.PlayerInput
 DefaultInputComponentClass=/Script/Engine.InputComponent
 DefaultTouchInterface=None
--- a/Content/Materials/M_vingette.uasset
+++ b/Content/Materials/M_vingette.uasset
--- a/Content/Siim_migrated/MI_West_SPG_M109_Damaged.uasset
+++ b/Content/Siim_migrated/MI_West_SPG_M109_Damaged.uasset
--- a/Content/Siim_migrated/M_Decos_Facade01.uasset
+++ b/Content/Siim_migrated/M_Decos_Facade01.uasset
--- a/Content/Siim_migrated/M_Villa_Pillar_1.uasset
+++ b/Content/Siim_migrated/M_Villa_Pillar_1.uasset
--- a/Content/Siim_migrated/M_Villa_Plaster_1.uasset
+++ b/Content/Siim_migrated/M_Villa_Plaster_1.uasset
--- a/Content/Siim_migrated/Materials/M_Villa_Pillar_1.uasset
+++ b/Content/Siim_migrated/Materials/M_Villa_Pillar_1.uasset
--- a/Content/VRTemplate/Blueprints/VRPawn.uasset
+++ b/Content/VRTemplate/Blueprints/VRPawn.uasset
--- a/Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset
+++ b/Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset
--- a/Content/VRTemplate/Maps/VRMapGrabLocomotion.umap
+++ b/Content/VRTemplate/Maps/VRMapGrabLocomotion.umap
Author	SHA1	Message	Date
DOMENIS\jelizavet	d2f13b90d8	Merge	2022-03-07 18:48:11 +02:00
DOMENIS\jelizavet	0b15820fdd	Grab dif project	2022-03-07 18:47:54 +02:00