diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index cd053d1..0498749 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,8 +2,8 @@ GameName=dejavu [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/ThirdPersonBP/Maps/ThirdPersonExampleMap -GameDefaultMap=/Game/ThirdPersonBP/Maps/ThirdPersonExampleMap +EditorStartupMap=/Game/Blueprints/Maps/TestMap.TestMap +GameDefaultMap=/Game/Blueprints/Maps/TestMap.TestMap TransitionMap= bUseSplitscreen=True TwoPlayerSplitscreenLayout=Horizontal @@ -17,10 +17,10 @@ MinimumiOSVersion=IOS_11 [/Script/Engine.Engine] +ActiveGameNameRedirects=(OldGameName="TP_ThirdPersonBP",NewGameName="/Script/dejavu") +ActiveGameNameRedirects=(OldGameName="/Script/TP_ThirdPersonBP",NewGameName="/Script/dejavu") +bUseFixedFrameRate=True [/Script/HardwareTargeting.HardwareTargetingSettings] TargetedHardwareClass=Desktop AppliedTargetedHardwareClass=Desktop DefaultGraphicsPerformance=Maximum AppliedDefaultGraphicsPerformance=Maximum - diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 962ab77..88a8b23 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -138,6 +138,7 @@ DoubleClickTime=0.200000 +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="Metrics",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=F10) +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/Blueprints/FirstPersonCharacter.uasset b/Content/Blueprints/Blueprints/FirstPersonCharacter.uasset index 9e07669..dfab378 100644 Binary files a/Content/Blueprints/Blueprints/FirstPersonCharacter.uasset and b/Content/Blueprints/Blueprints/FirstPersonCharacter.uasset differ diff --git a/Intermediate/CachedAssetRegistry.bin b/Intermediate/CachedAssetRegistry.bin index 1e6e441..6fde516 100644 Binary files a/Intermediate/CachedAssetRegistry.bin and b/Intermediate/CachedAssetRegistry.bin differ diff --git a/Intermediate/Config/CoalescedSourceConfigs/Engine.ini b/Intermediate/Config/CoalescedSourceConfigs/Engine.ini index 0a93803..0f0d1ef 100644 --- a/Intermediate/Config/CoalescedSourceConfigs/Engine.ini +++ b/Intermediate/Config/CoalescedSourceConfigs/Engine.ini @@ -2,8 +2,8 @@ [/Script/EngineSettings.GameMapsSettings] GameInstanceClass=/Script/Engine.GameInstance -EditorStartupMap=/Game/ThirdPersonBP/Maps/ThirdPersonExampleMap -GameDefaultMap=/Game/ThirdPersonBP/Maps/ThirdPersonExampleMap +EditorStartupMap=/Game/Blueprints/Maps/TestMap.TestMap +GameDefaultMap=/Game/Blueprints/Maps/TestMap.TestMap ServerDefaultMap=/Engine/Maps/Entry GlobalDefaultGameMode=/Game/Blueprints/Blueprints/GameplayMode.GameplayMode_C LocalMapOptions= @@ -249,6 +249,7 @@ MatineeTrackRedirects=(TargetClassName="/Script/Engine.CameraActor",OldFieldName MatineeTrackRedirects=(TargetClassName="/Script/Engine.CameraActor",OldFieldName="PostProcessSettings.",NewFieldName="CameraComponent.PostProcessSettings.") ActiveGameNameRedirects=(OldGameName="TP_ThirdPersonBP",NewGameName="/Script/dejavu") ActiveGameNameRedirects=(OldGameName="/Script/TP_ThirdPersonBP",NewGameName="/Script/dejavu") +bUseFixedFrameRate=True [CoreRedirects] ClassRedirects=(OldName="AnimGraphNode_BlendSpace",NewName="/Script/AnimGraph.AnimGraphNode_BlendSpacePlayer") diff --git a/Intermediate/Config/CoalescedSourceConfigs/Input.ini b/Intermediate/Config/CoalescedSourceConfigs/Input.ini index f6bdbd5..c28a560 100644 --- a/Intermediate/Config/CoalescedSourceConfigs/Input.ini +++ b/Intermediate/Config/CoalescedSourceConfigs/Input.ini @@ -137,6 +137,7 @@ ActionMappings=(ActionName="ResetVR",bShift=False,bCtrl=False,bAlt=False,bCmd=Fa 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="Metrics",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=F10) 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 e788449..6cc80be 100644 Binary files a/Saved/AutoScreenshot.png and b/Saved/AutoScreenshot.png differ diff --git a/Saved/Autosaves/Game/Blueprints/Blueprints/FirstPersonCharacter_Auto1.uasset b/Saved/Autosaves/Game/Blueprints/Blueprints/FirstPersonCharacter_Auto1.uasset index 3c4fd81..47384f2 100644 Binary files a/Saved/Autosaves/Game/Blueprints/Blueprints/FirstPersonCharacter_Auto1.uasset and b/Saved/Autosaves/Game/Blueprints/Blueprints/FirstPersonCharacter_Auto1.uasset differ diff --git a/Saved/Autosaves/Game/Blueprints/Blueprints/FirstPersonCharacter_Auto2.uasset b/Saved/Autosaves/Game/Blueprints/Blueprints/FirstPersonCharacter_Auto2.uasset new file mode 100644 index 0000000..4d247f6 Binary files /dev/null and b/Saved/Autosaves/Game/Blueprints/Blueprints/FirstPersonCharacter_Auto2.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/FirstPersonCharacter_2020-02-12-13-21-40.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-12-13-21-40.uasset new file mode 100644 index 0000000..9e07669 Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-12-13-21-40.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-12-13-29-40.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-12-13-29-40.uasset new file mode 100644 index 0000000..30cdd0c Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-12-13-29-40.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-12-13-36-10.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-12-13-36-10.uasset new file mode 100644 index 0000000..d53ba94 Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-12-13-36-10.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-12-13-41-33.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-12-13-41-33.uasset new file mode 100644 index 0000000..97c27f3 Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-12-13-41-33.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-13-07-33-42.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-33-42.uasset new file mode 100644 index 0000000..90d5547 Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-33-42.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-13-07-40-59.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-40-59.uasset new file mode 100644 index 0000000..8c3cb34 Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-40-59.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-13-07-46-52.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-46-52.uasset new file mode 100644 index 0000000..6fc30e1 Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-46-52.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-13-07-52-26.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-52-26.uasset new file mode 100644 index 0000000..8663aec Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-52-26.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-13-07-57-41.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-57-41.uasset new file mode 100644 index 0000000..b1b6044 Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-13-07-57-41.uasset differ diff --git a/Saved/Backup/FirstPersonCharacter_2020-02-13-08-03-25.uasset b/Saved/Backup/FirstPersonCharacter_2020-02-13-08-03-25.uasset new file mode 100644 index 0000000..09a5f3d Binary files /dev/null and b/Saved/Backup/FirstPersonCharacter_2020-02-13-08-03-25.uasset differ