Merge

Grab dif project
Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment into master
2022-03-07 18:48:11 +02:00 · 2022-03-07 18:47:54 +02:00 · 2022-03-07 17:33:55 +02:00 · 2022-03-07 17:31:45 +02:00
5 changed files with 12 additions and 2 deletions
@@ -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
Author	SHA1	Message	Date
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