diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 0e42bbf5..03eef806 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,8 +8,15 @@ - + + + + + + + + diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset new file mode 100644 index 00000000..6eb66527 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_CrouchTutorial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5325ea111c8fb93bc1041dd9c0047c5e79a495b1d915692a93953e66f9928b7a +size 32432 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset new file mode 100644 index 00000000..f24f6bb6 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_GoToParkourRoom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7de40abb954725c469a7fcb11456a11922dce9ce061d1540cab05467116aae29 +size 65818 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset new file mode 100644 index 00000000..051f0897 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_JumpAcross.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4253efb3878b3746237d94284c111cbf6b7194174abacc443977b6c5c05376f2 +size 32263 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset new file mode 100644 index 00000000..0345249c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpPistol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21364379b0705a11a56116ea8b2fc9d8fd43079f8147a2ef84314b9cda8d97f9 +size 18316 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset new file mode 100644 index 00000000..e3a3f7b0 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpShotgun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:517c23d9b6fe1d1c153e85a8fba4c1395718150de1043538126813b8528f2b29 +size 112571 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset new file mode 100644 index 00000000..19cfa978 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ShotgunTargets.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b82203fe93ab0db2ec9fce1a765d76d8eef064de5035836ec8964abe3dadb376 +size 140176 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset new file mode 100644 index 00000000..3d7aa91c --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SprintAcross.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:997d9aabef7ac6af506b7c5e0ae86773102ebe12751037356f93165a94a3b8aa +size 32411 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset new file mode 100644 index 00000000..f4893bc5 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_VaultOver.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c8afdedd67bcb947122e95349c550600f599cd77cc28d582f422bf7f97e547f +size 32316 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset index b068ce76..a0841207 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afa39ee6051cf8de083ac7531226891b50663f9121180792c783a1164a7d2e38 -size 22782 +oid sha256:e78faeaf50f50707879bcd856dbba79d38a8bfc7606fd3dd7c79f3cd7f4c36be +size 24203 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset index 801e58a7..26886a65 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/BP_DroppableWall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c7cc4d2e0cbe25fbe535bfada1d5d6c581a3fe5754855fb6b94c0c1254ddcd4 -size 128878 +oid sha256:5b896386b8e32c99eca2998dcc443984ebf5a6ea28c54046bfe4f3027503f07d +size 127945 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset index 79dc1ef6..798e2226 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c125e80e167538b873773fa5c90ed7f6e37b6efc8fe4e5dfe4c90078a0782b3 -size 64051 +oid sha256:92bcdc4257fb418b5d58b8d291fead0d206ea59774856556af22e6e182299e07 +size 101690 diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap index 76704cd0..0086cc45 100644 --- a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap +++ b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81b4af129dd64a974daf8ea63b3e8635b024f3725e64d3c6033c49baefd8ab82 -size 3173962 +oid sha256:e5359d34f51cb7298d6e3c64aa6ff60e6a610066339af826e5e53b95436f12be +size 3184727 diff --git a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset index 5e3ff30e..6f8d7ae6 100644 --- a/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset +++ b/EndlessVendetta/Content/StarterContent/Audio/Collapse01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85c827023ee4b466228ec65e92b4b4a0415a106de041ac1c2cab481a2a5dfa8d -size 348532 +oid sha256:1bacbc9ef1c664cee5c8ea9f08490fe6c08051fd2c6db54e5534f5a7e6730276 +size 353648 diff --git a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset index 2883abf3..0f990580 100644 --- a/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset +++ b/EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4859d43a803b89375bb161775fc6318ef1e9fc5318f8836540265573c3bcae3b -size 66790690 +oid sha256:bc35eb2d43a47427d30aba0196f9eac90d089dd3abca319528c5d25c83510d0d +size 72364642 diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp index c5399b59..0c9d0313 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp @@ -29,7 +29,7 @@ void ACheckpointClass::SpawnWaypoint(const FString& CurrentBountyTitle) WaypointActor->SetupWaypoint(WaypointIcon, BountyTitle); } -void ACheckpointClass::UpdateChecpointWaypoint(FVector WaypointNewLoc) +void ACheckpointClass::UpdateCheckpointWaypoint(FVector WaypointNewLoc) { FActorSpawnParameters SpawnParams; SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn; diff --git a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h index 68931530..7a9ada47 100644 --- a/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h +++ b/EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.h @@ -41,7 +41,7 @@ protected: } UFUNCTION(BlueprintCallable) - void UpdateChecpointWaypoint(FVector WaypointNewLoc); + void UpdateCheckpointWaypoint(FVector WaypointNewLoc); // Called when the game starts or when spawned virtual void BeginPlay() override;