Compare commits

...

16 Commits

Author SHA1 Message Date
jelizavet 3eea75f7db stereo vision 2022-03-28 18:06:05 +03:00
jelizavet f145eff6a1 bottle implementation 2022-03-28 17:48:06 +03:00
jelizavet ec375254b7 Setup 2022-03-28 15:39:55 +03:00
jelizavet 00e80e27ca Debug 2022-03-23 00:05:47 +02:00
jelizavet 84f4348b91 Grab fixes 2022-03-20 18:31:17 +02:00
jelizavet d2f13b90d8 Merge 2022-03-07 18:48:11 +02:00
jelizavet 0b15820fdd Grab dif project 2022-03-07 18:47:54 +02:00
l31tm0t1f efa77c7dbb Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment into master
# Conflicts:
#	Content/VRTemplate/Maps/VRTemplateMap.umap
#	Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
2022-03-07 17:33:55 +02:00
l31tm0t1f c936cbdc02 2.commit 2022-03-07 17:31:45 +02:00
jelizavet 734dd5f8e0 Shaking tree asset from procedural nature pack 2022-03-06 21:55:16 +02:00
helenasokk 41ffd6339c *Helena's assets commit again 2022-03-06 16:56:56 +02:00
helenasokk 1e440bc4ab Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment
# Conflicts:
#	Content/VRTemplate/Maps/VRTemplateMap.umap
#	Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
2022-03-06 16:41:06 +02:00
helenasokk 4825126cd7 *trying to fix errors 2022-03-06 16:34:56 +02:00
l31tm0t1f c1d47a9a82 Siim's 1st commit 2022-03-06 15:25:51 +02:00
helenasokk b1fccc09ba *adding new assets 2022-03-05 23:04:25 +02:00
helenasokk 5d335b4856 *adding new assets 2022-03-05 23:00:15 +02:00
98 changed files with 297 additions and 7 deletions
+9 -1
View File
@@ -142,6 +142,12 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_System_Click)
+ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Menu_Click)
+ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Menu_Click)
+ActionMappings=(ActionName="GrabPullLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Y_Click)
+ActionMappings=(ActionName="GrabPullRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton)
+ActionMappings=(ActionName="ScaleWorldUp",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_A_Click)
+ActionMappings=(ActionName="ScaleWorldUp",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
+ActionMappings=(ActionName="ScaleWorldDown",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z)
+ActionMappings=(ActionName="ScaleWorldDown",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_B_Click)
+AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X)
+AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis)
+AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y)
@@ -184,7 +190,9 @@ DoubleClickTime=0.200000
+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=ValveIndex_Right_Thumbstick_Y)
+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)
+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=D)
+AxisMappings=(AxisName="MovementAxisRight_X",Scale=1.000000,Key=A)
DefaultPlayerInputClass=/Script/Engine.PlayerInput
DefaultInputComponentClass=/Script/Engine.InputComponent
DefaultTouchInterface=None
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.