diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index 6140f103..5f4edb5d 100644 --- a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset +++ b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4def2ed14a5351d8d9e9b13d65d01cee2a7233fd5f3aaf52535509d66bc0a96 -size 324685 +oid sha256:becf8da587c9c1d29a5d7d23a32f1a2a589f97772ab05103857ead422db71baa +size 337375 diff --git a/EndlessVendetta/Content/Levels/EnemyAITest.umap b/EndlessVendetta/Content/Levels/EnemyAITest.umap index f0f1c07a..521522d8 100644 --- a/EndlessVendetta/Content/Levels/EnemyAITest.umap +++ b/EndlessVendetta/Content/Levels/EnemyAITest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97f28af544501872195bdf14fd3a58f7d347a193661e85581c1561a5ef397a48 -size 19695 +oid sha256:45612a17ef1884589b3bcfba343492aa405c465d256c5b54be3a74153ce8b5ee +size 19498 diff --git a/EndlessVendetta/EndlessVendetta.uproject b/EndlessVendetta/EndlessVendetta.uproject index cbc08bbc..77153aad 100644 --- a/EndlessVendetta/EndlessVendetta.uproject +++ b/EndlessVendetta/EndlessVendetta.uproject @@ -63,10 +63,6 @@ "Name": "MixamoAnimationRetargeting", "Enabled": true, "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/c684998124da4e2583b314dc95403a80" - }, - { - "Name": "RigLogic", - "Enabled": true } ] } \ No newline at end of file diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 27d10ec3..4978ab3c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -176,7 +176,7 @@ public: UPROPERTY(BlueprintAssignable, Category = "Weapons") FSuccessfulHitEvent SuccessfulHitEvent; - void SuccessfulHit(bool bIsHeadshot) const; + void SuccessfulHit(bool bIsHeadshot = false) const; protected: virtual void BeginPlay() override; diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index d9eef0e5..b8ff3c33 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -210,14 +210,14 @@ void ABaseWeaponClass::Fire() } else { - endlessVendettaChar->SuccessfulHit(false); + endlessVendettaChar->SuccessfulHit(); } Cast(outHit.GetActor())->TakeDamage(tempWeaponDamage, FPointDamageEvent(), GetWorld()->GetFirstPlayerController(), this); } if (ATargetDummy* TargetDummy = Cast(outHit.GetActor())) { TargetDummy->TargetShot(); - endlessVendettaChar->SuccessfulHit(false); + endlessVendettaChar->SuccessfulHit(); } } HideNeedReloadUI();