diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index d15d777..b61f02d 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -137,9 +137,10 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Thumbstick_Click) +ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Left_Thumbstick_Click) +ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Left_Bumper) -+ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=F) ++ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) +ActionMappings=(ActionName="Metrics",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=F10) +ActionMappings=(ActionName="Quit",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Escape) ++ActionMappings=(ActionName="Rotate",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton) +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) +AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Up) diff --git a/Content/Blueprints/CharacterController.uasset b/Content/Blueprints/CharacterController.uasset index 1e7f19f..d1cf97c 100644 Binary files a/Content/Blueprints/CharacterController.uasset and b/Content/Blueprints/CharacterController.uasset differ diff --git a/Content/Maps/TestMap_BuiltData.uasset b/Content/Maps/TestMap_BuiltData.uasset index d9f758e..ef6e138 100644 Binary files a/Content/Maps/TestMap_BuiltData.uasset and b/Content/Maps/TestMap_BuiltData.uasset differ diff --git a/Intermediate/CachedAssetRegistry.bin b/Intermediate/CachedAssetRegistry.bin index b630c8a..755be3d 100644 Binary files a/Intermediate/CachedAssetRegistry.bin and b/Intermediate/CachedAssetRegistry.bin differ diff --git a/Intermediate/Config/CoalescedSourceConfigs/Input.ini b/Intermediate/Config/CoalescedSourceConfigs/Input.ini index 738bcd5..c1df13d 100644 --- a/Intermediate/Config/CoalescedSourceConfigs/Input.ini +++ b/Intermediate/Config/CoalescedSourceConfigs/Input.ini @@ -136,9 +136,10 @@ ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=Fa ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Thumbstick_Click) ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Left_Thumbstick_Click) ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Left_Bumper) -ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=F) +ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) ActionMappings=(ActionName="Metrics",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=F10) ActionMappings=(ActionName="Quit",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Escape) +ActionMappings=(ActionName="Rotate",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton) AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S) AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=Up) diff --git a/Saved/AutoScreenshot.png b/Saved/AutoScreenshot.png index 326accb..9197ba2 100644 Binary files a/Saved/AutoScreenshot.png and b/Saved/AutoScreenshot.png differ diff --git a/Saved/Autosaves/Game/Blueprints/CharacterController_Auto1.uasset b/Saved/Autosaves/Game/Blueprints/CharacterController_Auto1.uasset new file mode 100644 index 0000000..24f4839 Binary files /dev/null and b/Saved/Autosaves/Game/Blueprints/CharacterController_Auto1.uasset differ diff --git a/Saved/Autosaves/PackageRestoreData.json b/Saved/Autosaves/PackageRestoreData.json index a6c4643..4e4a13a 100644 Binary files a/Saved/Autosaves/PackageRestoreData.json and b/Saved/Autosaves/PackageRestoreData.json differ diff --git a/Saved/Backup/CharacterController_2020-02-13-18-45-06.uasset b/Saved/Backup/CharacterController_2020-02-13-18-45-06.uasset new file mode 100644 index 0000000..1e7f19f Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-18-45-06.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-18-51-23.uasset b/Saved/Backup/CharacterController_2020-02-13-18-51-23.uasset new file mode 100644 index 0000000..8a0e31e Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-18-51-23.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-18-56-43.uasset b/Saved/Backup/CharacterController_2020-02-13-18-56-43.uasset new file mode 100644 index 0000000..2217568 Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-18-56-43.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-19-05-00.uasset b/Saved/Backup/CharacterController_2020-02-13-19-05-00.uasset new file mode 100644 index 0000000..67235b3 Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-19-05-00.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-19-11-15.uasset b/Saved/Backup/CharacterController_2020-02-13-19-11-15.uasset new file mode 100644 index 0000000..69a1abb Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-19-11-15.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-19-17-16.uasset b/Saved/Backup/CharacterController_2020-02-13-19-17-16.uasset new file mode 100644 index 0000000..827cccd Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-19-17-16.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-19-27-05.uasset b/Saved/Backup/CharacterController_2020-02-13-19-27-05.uasset new file mode 100644 index 0000000..df499f2 Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-19-27-05.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-19-35-08.uasset b/Saved/Backup/CharacterController_2020-02-13-19-35-08.uasset new file mode 100644 index 0000000..c6bf570 Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-19-35-08.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-19-40-57.uasset b/Saved/Backup/CharacterController_2020-02-13-19-40-57.uasset new file mode 100644 index 0000000..7afb622 Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-19-40-57.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-19-47-37.uasset b/Saved/Backup/CharacterController_2020-02-13-19-47-37.uasset new file mode 100644 index 0000000..5e22130 Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-19-47-37.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-19-54-36.uasset b/Saved/Backup/CharacterController_2020-02-13-19-54-36.uasset new file mode 100644 index 0000000..82fcddc Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-19-54-36.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-20-00-55.uasset b/Saved/Backup/CharacterController_2020-02-13-20-00-55.uasset new file mode 100644 index 0000000..ac92e40 Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-20-00-55.uasset differ diff --git a/Saved/Backup/CharacterController_2020-02-13-20-06-43.uasset b/Saved/Backup/CharacterController_2020-02-13-20-06-43.uasset new file mode 100644 index 0000000..811b336 Binary files /dev/null and b/Saved/Backup/CharacterController_2020-02-13-20-06-43.uasset differ diff --git a/Saved/Backup/TestMap_BuiltData_2020-02-13-19-05-38.uasset b/Saved/Backup/TestMap_BuiltData_2020-02-13-19-05-38.uasset new file mode 100644 index 0000000..d9f758e Binary files /dev/null and b/Saved/Backup/TestMap_BuiltData_2020-02-13-19-05-38.uasset differ diff --git a/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-38-59.uasset b/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-38-59.uasset deleted file mode 100644 index 650c482..0000000 Binary files a/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-38-59.uasset and /dev/null differ diff --git a/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-44-19.uasset b/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-44-19.uasset deleted file mode 100644 index 5f06bfd..0000000 Binary files a/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-44-19.uasset and /dev/null differ diff --git a/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-49-38.uasset b/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-49-38.uasset deleted file mode 100644 index a0ad59d..0000000 Binary files a/Saved/Backup/ThirdPersonCharacter_2020-02-11-22-49-38.uasset and /dev/null differ diff --git a/Saved/Backup/ThirdPersonExampleMap_2020-02-11-22-46-26.umap b/Saved/Backup/ThirdPersonExampleMap_2020-02-11-22-46-26.umap deleted file mode 100644 index 0ba87e4..0000000 Binary files a/Saved/Backup/ThirdPersonExampleMap_2020-02-11-22-46-26.umap and /dev/null differ