Merge remote-tracking branch 'origin/main'

# Conflicts:
#	Intermediate/CachedAssetRegistry.bin
#	Saved/AutoScreenshot.png
#	Saved/Config/CrashReportClient/UE4CC-Windows-26C0574148A80F1241BAC28EB3C6CB42/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-85ACC2DF4F5ECBEB010EDC890FABFAB7/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-884F02AE422160193B63EB9556766C5A/CrashReportClient.ini
#	Saved/Config/CrashReportClient/UE4CC-Windows-AB1C1390466C882DFD90D08C57659F53/CrashReportClient.ini
#	Saved/Config/Windows/EditorPerProjectUserSettings.ini
#	Saved/Logs/DesertGame.log
#	Saved/SaveGames/1.sav
This commit is contained in:
2024-07-01 13:42:18 +02:00
25 changed files with 6914 additions and 4798 deletions

View File

@@ -79,6 +79,8 @@ DefaultViewportMouseLockMode=LockOnCapture
ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom)
ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R)
ActionMappings=(ActionName="Action",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E)
ActionMappings=(ActionName="Click",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY)
AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY)
AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=Down)