минор, расставил свет в ночи

This commit is contained in:
Andron666
2021-08-17 19:03:07 +05:00
parent c8ce3218a1
commit 80044bbec1
105 changed files with 9 additions and 13 deletions
+1
View File
@@ -57,6 +57,7 @@ GlobalDefaultGameMode=/Game/Blueprints/Player/myGM.myGM_C
+EditProfiles=(Name="UI",CustomResponses=((Channel="UI",Response=ECR_Overlap)))
+EditProfiles=(Name="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="walls"),(Channel="WorldStatic",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore),(Channel="GrassFinding",Response=ECR_Ignore)))
+EditProfiles=(Name="Spectator",CustomResponses=((Channel="walls")))
+EditProfiles=(Name="InvisibleWall",CustomResponses=((Channel="Camera",Response=ECR_Ignore)))
-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall")
-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn")
-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")
+5 -11
View File
@@ -1,14 +1,6 @@
<<<<<<< Updated upstream
[/Script/Engine.InputSettings]
bUseMouseForTouch=True
DefaultTouchInterface=None
bEnableMouseSmoothing=False
DefaultViewportMouseCaptureMode=NoCapture
DefaultViewportMouseLockMode=LockOnCapture
bCaptureMouseOnLaunch=False
=======
[/Script/Engine.InputSettings]
-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
@@ -90,10 +82,12 @@ DefaultViewportMouseCaptureMode=NoCapture
DefaultViewportMouseLockMode=LockOnCapture
FOVScale=0.011110
DoubleClickTime=0.200000
+ActionMappings=(ActionName="teleportL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Trackpad_Click)
+ActionMappings=(ActionName="triggerL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Trigger_Click)
+ActionMappings=(ActionName="teleportR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Click)
+ActionMappings=(ActionName="troggerR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trigger_Click)
+ActionMappings=(ActionName="triggerL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Trigger_Click)
+ActionMappings=(ActionName="troggerR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Trigger_Click)
+ActionMappings=(ActionName="menu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_X_Click)
+ActionMappings=(ActionName="menu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_A_Click)
+AxisMappings=(AxisName="right",Scale=1.000000,Key=Right)
+AxisMappings=(AxisName="forward",Scale=1.000000,Key=Up)
+AxisMappings=(AxisName="right",Scale=-1.000000,Key=Left)
@@ -102,9 +96,9 @@ DoubleClickTime=0.200000
+AxisMappings=(AxisName="forward",Scale=-1.000000,Key=Down)
+AxisMappings=(AxisName="forward",Scale=1.000000,Key=W)
+AxisMappings=(AxisName="forward",Scale=-1.000000,Key=S)
+AxisMappings=(AxisName="VRtrigger",Scale=1.000000,Key=OculusTouch_Right_Trigger_Axis)
DefaultTouchInterface=None
-ConsoleKeys=Tilde
+ConsoleKeys=Tilde
+ConsoleKeys=None
>>>>>>> Stashed changes
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.

Some files were not shown because too many files have changed in this diff Show More