diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index 92444216..a72b0fcd 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -8,7 +8,10 @@ - + + + + diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset new file mode 100644 index 00000000..2af01bdc --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_ARTargets.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2fa8f3a9544a1a634ef263e4fbb972cd89d36e288969fd8ab0433b58d3217ed +size 139421 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset new file mode 100644 index 00000000..974afaa5 --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpAR.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd1d85ab782abd0e077f12beb4112d4451c7c64d574fdac5286e919c833fd3ad +size 112873 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset new file mode 100644 index 00000000..59489c9b --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PickUpSniper.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b40a020b449acdbe5936f8f50ca0392383ed9052fbc816bd801bc8f7891a116 +size 112615 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset index eb0d6f58..1aa9c10a 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_PistolTargets.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ddd83b64650a04c48de10697ad948edc429bf844901836043bd51cd4718232a -size 139035 +oid sha256:5a5faea0ea4c17c09962caf04dbd847ae816e8393357f9d3aa3b98e58a536cd5 +size 138635 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset new file mode 100644 index 00000000..5b294b0d --- /dev/null +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_SniperTargets.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b8f05d26ba5ca90f8715c4b4f46a602ffecfe30b16dff0162e2109245b2f32d +size 133796 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/MB_Training.uasset index 96be6785..194c5d31 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:021c1de97d50e4b936493798ab7da8b2b51c66ee113c91dc2317ca63be737234 -size 24591 +oid sha256:3d4bf606dcf907e9144583416d378aadd2bb99a1d5b0a18c51356473112b1922 +size 25351 diff --git a/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap b/EndlessVendetta/Content/Levels/ControlTutorialLevel.umap index ad410241..c76db8de 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:08aba39768a1848c4532bff5c2dfc381920543bcfeb179d4fd47633346dabb91 +oid sha256:824ad14a4e81e778aae3fabb1a2e2496dd263a51cf59e321e3005100084f3a32 size 3229946 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 00b74640..8ceca81c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -430,6 +430,7 @@ void AEndlessVendettaCharacter::WeaponSwitcher(AActor* Outhit) { if(Outhit->ActorHasTag("PrimaryWeapon")) { + UE_LOG(LogTemp, Warning, TEXT("lmao")); if (IsValid(PrimaryWeapon)) { EquipPrimary();