Merge mit Aenderungen von master, einzgier Konflikt mit DoorButton_BP, geloest zugunsten von master

This commit is contained in:
Finn Wundram 2020-11-23 17:17:12 +01:00
commit 18fcf5b614
19 changed files with 2 additions and 0 deletions

View File

@ -45,6 +45,8 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="Grab",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton)
+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
+ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
+ActionMappings=(ActionName="PauseGame",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Escape)
+ActionMappings=(ActionName="PauseGame",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=P)
+AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W)
+AxisMappings=(AxisName="MoveRight",Scale=-1.000000,Key=A)
+AxisMappings=(AxisName="TurnRate",Scale=-1.000000,Key=Left)

Binary file not shown.

BIN
Content/Levels/Raum4.umap Normal file

Binary file not shown.

Binary file not shown.