From c7a52e42a5d451bfd6dc3bc3c6931e58745183ec Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 29 Feb 2024 02:13:53 +0000 Subject: [PATCH 1/8] Update HUD for Crosshair Change, Health & Stamina Redesign --- Assets/UI/UI_Bar_Fill.png | 3 +++ Assets/UI/UI_Bar_Outline.png | 3 +++ .../Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset | 3 +++ .../Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset | 3 +++ .../Content/FirstPerson/Blueprints/WBP_Crosshair.uasset | 4 ++-- 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Assets/UI/UI_Bar_Fill.png create mode 100644 Assets/UI/UI_Bar_Outline.png create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset diff --git a/Assets/UI/UI_Bar_Fill.png b/Assets/UI/UI_Bar_Fill.png new file mode 100644 index 00000000..11f19b95 --- /dev/null +++ b/Assets/UI/UI_Bar_Fill.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5ee098dda8de99c8f10705e2aca1d4d142a91e028a5ca86d1c90acb3bb78fda +size 3158 diff --git a/Assets/UI/UI_Bar_Outline.png b/Assets/UI/UI_Bar_Outline.png new file mode 100644 index 00000000..bc4600c5 --- /dev/null +++ b/Assets/UI/UI_Bar_Outline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fc8bc9b68a6b62c5f7db980c09b1b5ce2a320e44a7939a6fc4aa09b445b8cda +size 3138 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset new file mode 100644 index 00000000..8fe33c23 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Fill.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9f3fc131c430ec3e685954e4a38df3470f44e5789f7aba6cbc765b5a2b8573b +size 8992 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset new file mode 100644 index 00000000..c6fb8419 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/UI_Bar_Outline.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c6f06eb6ba856c4066ca5299d72062828a630d0484ddb436bd6b76154664a22 +size 8508 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset index 29ebde67..276144b1 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ac7733948c885fda46dd009dd75dfe5c79abf1262e9aadcf17c401bb8f64ecf -size 93512 +oid sha256:84c4551cd32fceb432a89a46c007d93f56fb0d08dc5d7569f84980228e49e295 +size 102918 From 768d53549fa86f8c768da1fbfc598d91db7f5c6f Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 29 Feb 2024 02:57:55 +0000 Subject: [PATCH 2/8] Update AI for Improved Hit Detection & Projectiles --- .../AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset | 4 ++-- .../Content/AI/Enemy/Basic/BT_BasicEnemy.uasset | 4 ++-- .../Content/FirstPerson/Blueprints/WBP_Crosshair.uasset | 2 +- .../Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset | 2 +- .../Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset | 3 +++ .../EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp | 9 +++++---- 6 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset index 9c97d447..dda6854c 100644 --- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset +++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c268b1483a8b92c1b103dd1efc9f354c17c31f92b6ef2af41a4893bb9b63062 -size 143554 +oid sha256:1623e6cc7c50058c9d5cfcb32f1ab42396db8741c8a32a846c16f478117cf071 +size 190013 diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset index 4a874ddc..cdcb890d 100644 --- a/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset +++ b/EndlessVendetta/Content/AI/Enemy/Basic/BT_BasicEnemy.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:019e879ee15b4850fb9e601944cc2337663d20b4240b0cdf5006727321a0e496 -size 80128 +oid sha256:0476e9712ee5e2767e2a60ae4bfdf21ca085b391c0215095f4981c8b785c07b1 +size 78165 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset index 276144b1..93b96ec7 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84c4551cd32fceb432a89a46c007d93f56fb0d08dc5d7569f84980228e49e295 +oid sha256:05c687aa8ceac4bba8eecd8eedf6ef3f74095d2eacc9d079af5d249a31a77493 size 102918 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset index ccb0acc7..c1e62052 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/8N/O8PP5KE5USY7FTAE75J65R.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:461171dba6a85d0e829f1f673756b08af877379d651c7bfcd0028b6de32a36d7 +oid sha256:2ec8c02c25733c7a4a32c82f2d0e412cc84745c4400caf98507101420f833b0a size 6554 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset new file mode 100644 index 00000000..7050f6f3 --- /dev/null +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92f3335f7ae968df65871b3d98b5d6356b798575530420ef5dfaaf1c18979010 +size 6620 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp index 3b4ff281..2f61f52e 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp @@ -20,16 +20,17 @@ EBTNodeResult::Type UBTTask_AttackPlayer::ExecuteTask(UBehaviorTreeComponent& Ow { if (const UBlackboardComponent* const Blackboard = OwnerComp.GetBlackboardComponent()) { - FVector const Origin = AIController->GetPawn()->GetActorLocation(); - FVector const Start = Origin + FVector(0.f, 0.f, 30.f); - FVector const PlayerLocation = Blackboard->GetValueAsVector("TargetLocation"); + USkeletalMeshComponent* const GunSKMesh = Cast(AIController->GetPawn()->GetComponentsByTag(USkeletalMeshComponent::StaticClass(), "Gun")[0]); + FVector const Origin = IsValid(GunSKMesh) ? GunSKMesh->GetComponentLocation() : AIController->GetPawn()->GetActorLocation() + FVector(0.f, 0.f, 30.f); + FVector const Start = Origin; + FVector const End = Origin + AIController->GetPawn()->GetActorForwardVector() * 10000.f; if (AEnemyCharacter* const EnemyCharacter = Cast(AIController->GetPawn())) { EnemyCharacter->FireWeapon.Broadcast(); EnemyCharacter->SetFiring(true); FCollisionQueryParams QueryParams; QueryParams.AddIgnoredActor(AIController->GetPawn()); - if (FHitResult HitResult; GetWorld()->LineTraceSingleByChannel(HitResult, Start, PlayerLocation, ECC_Pawn, QueryParams)) + if (FHitResult HitResult; GetWorld()->LineTraceSingleByChannel(HitResult, Start, End, ECC_Pawn, QueryParams)) { if (IsValid(HitResult.GetActor())) { From 82f20c6a3b8d03786f6cfd1eadc28b4f41ac352c Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 29 Feb 2024 03:16:06 +0000 Subject: [PATCH 3/8] Update AI Movement to Improve Rotation & Walk Path --- EndlessVendetta/Config/DefaultEngine.ini | 4 ++-- .../Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset | 4 ++-- .../Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset | 4 ++-- EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset | 4 ++-- .../Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset | 2 +- .../Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset | 2 +- .../Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset | 2 +- .../Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset | 4 ++-- .../Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/EndlessVendetta/Config/DefaultEngine.ini b/EndlessVendetta/Config/DefaultEngine.ini index 385828bc..900bc5ba 100644 --- a/EndlessVendetta/Config/DefaultEngine.ini +++ b/EndlessVendetta/Config/DefaultEngine.ini @@ -154,8 +154,8 @@ ManualIPAddress= +PropertyRedirects=(OldName="/Script/EndlessVendetta.BaseWeaponClass.player",NewName="/Script/EndlessVendetta.BaseWeaponClass.playerInWorld") [/Script/NavigationSystem.RecastNavMesh] -AgentMaxStepHeight=73.434059 -AgentMaxSlope=64.648003 +AgentMaxStepHeight=45.929649 +AgentMaxSlope=45.053085 CellSize=10.000000 RuntimeGeneration=Dynamic diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset index 1d2734e4..1122bc74 100644 --- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset +++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbfb60916a9c0c6eb0b0c22c4fbf890ea502ce090da3c24aff038297078ef9b8 -size 86630 +oid sha256:f005a186ef92b714cb664d4fdf398146475ce37722dad7f7eb88c92907d29046 +size 87141 diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset index dda6854c..190bd59c 100644 --- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset +++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1623e6cc7c50058c9d5cfcb32f1ab42396db8741c8a32a846c16f478117cf071 -size 190013 +oid sha256:61462c421ab0dc8ce273e8895219e610f187663b1bf58b5d90257d1fb36bfb24 +size 185755 diff --git a/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset b/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset index 30848631..2b284f80 100644 --- a/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset +++ b/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a316db2f6fe9c19dd2c2b4212b38773c9ab69365f79d55d31a4d0d165dc4c71 -size 457886 +oid sha256:e4d1a3b3e0467ea6209b76b21bba2f31d264b09d97b92532fb886028bf649739 +size 457314 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset index f4c19c6c..e97a46e7 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eaeb890cdb58d88b164d2eb5d277385d812ed5319aa222cedee46f892602c24e +oid sha256:452a3cdeeef68c705f66e8afb9d80dc77571340f7a4060273e7f81f85afe2eac size 123322 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset index f4a9674c..a617105b 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9544a21d231770f149e023911478ef866a28432f9a8594c997aeac39fb69c9ba +oid sha256:e4b583d455754ff09c5d8fba266ee4e244455c55de769842659e50c56eb0fab9 size 5644 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset index 68c2d846..a4803310 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:287cefc679ae187520972601785415ede0e78e970f51012db4dec2e94058c6c6 +oid sha256:f6fc47f6f495a99c14682b0fb16785bd7de5409c96eb2adfa039af0319a750c9 size 5977 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset index 046856da..b6529d55 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/A/9W/KV7XP1AJXG9P45HFKK5F76.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3eed22e9a75e30cebd8574185c54a478a3b8179caccb511cab24ab86f6609b1 -size 16471 +oid sha256:16cfe138259c36e77c2ed4c6dd7a356bf31d23a52f5cbd20d0dbfcc88047c48c +size 35743 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset index 7050f6f3..db7dd2b8 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92f3335f7ae968df65871b3d98b5d6356b798575530420ef5dfaaf1c18979010 -size 6620 +oid sha256:4fec8b8a97591f3a05ecacb49f14a9949fe6b33c05b62e13dc1c06ce17d1b9cc +size 6568 From f52a69798ae22d245b68cdf809e6948f3c416be6 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 29 Feb 2024 03:31:04 +0000 Subject: [PATCH 4/8] Bugfix Unable to Damage Dhruv --- EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset | 4 ++-- .../Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset b/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset index 2b284f80..64bc652f 100644 --- a/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset +++ b/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4d1a3b3e0467ea6209b76b21bba2f31d264b09d97b92532fb886028bf649739 -size 457314 +oid sha256:ca5941c73008c829ff78317b951a30b360b43bcca9ede2d9ae043f526d654992 +size 458816 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset index e97a46e7..113442cd 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:452a3cdeeef68c705f66e8afb9d80dc77571340f7a4060273e7f81f85afe2eac +oid sha256:2af5b43ef0f56d697893c4d4a9377b49297ca7c5289292ebb3c845d67c852b3d size 123322 From 90d9fd50a52af7942ca79ca50c1f9341fb4a53a7 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 29 Feb 2024 03:41:55 +0000 Subject: [PATCH 5/8] Update Reload Text for Animation & Concise Wording --- .../Blueprints/BaseWeapons/WBP_NeedReloadText.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset index e4da925b..d1da95d4 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:493e53f9d833ac8e2bc03cc86122efe0f1711e74e6258ea90016b907983ad84c -size 37938 +oid sha256:72cba357e30cece3b49ba1ca72399b20100afbbddc61af47630f4f08292ecdd8 +size 48684 From a36f65cbc6e351d1c0770f106cd97b82d0b02b59 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 29 Feb 2024 04:31:55 +0000 Subject: [PATCH 6/8] Bugfix Crash on AI with No Weapons --- .../Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp index 2f61f52e..95cd2d5b 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp @@ -20,7 +20,11 @@ EBTNodeResult::Type UBTTask_AttackPlayer::ExecuteTask(UBehaviorTreeComponent& Ow { if (const UBlackboardComponent* const Blackboard = OwnerComp.GetBlackboardComponent()) { - USkeletalMeshComponent* const GunSKMesh = Cast(AIController->GetPawn()->GetComponentsByTag(USkeletalMeshComponent::StaticClass(), "Gun")[0]); + USkeletalMeshComponent* GunSKMesh = nullptr; + if (AIController->GetPawn()->GetComponentsByTag(USkeletalMeshComponent::StaticClass(), "Gun").Num() > 0) + { + GunSKMesh = Cast(AIController->GetPawn()->GetComponentsByTag(USkeletalMeshComponent::StaticClass(), "Gun")[0]); + } FVector const Origin = IsValid(GunSKMesh) ? GunSKMesh->GetComponentLocation() : AIController->GetPawn()->GetActorLocation() + FVector(0.f, 0.f, 30.f); FVector const Start = Origin; FVector const End = Origin + AIController->GetPawn()->GetActorForwardVector() * 10000.f; From fd9c37d1487296f157072f3f733a5d0ff9c63ddf Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 29 Feb 2024 04:32:37 +0000 Subject: [PATCH 7/8] Bugfix Stuck on Face Rotation on Attack --- .../Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset | 4 ++-- .../Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset | 4 ++-- EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset | 4 ++-- .../Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset | 4 ++-- .../Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset | 2 +- .../Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset | 2 +- .../Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset index 1122bc74..8fa26b1c 100644 --- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset +++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f005a186ef92b714cb664d4fdf398146475ce37722dad7f7eb88c92907d29046 -size 87141 +oid sha256:e89d7a0fe15df57fc1fb57af25a3d5914691c156f56d867080dee8f647223808 +size 87164 diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset index 190bd59c..361d0d40 100644 --- a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset +++ b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61462c421ab0dc8ce273e8895219e610f187663b1bf58b5d90257d1fb36bfb24 -size 185755 +oid sha256:d35b41342c9550d5e5b4956552eb99ff17a3f4f2eed7857336d19966d87d99cb +size 184178 diff --git a/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset b/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset index 64bc652f..f73e6b8b 100644 --- a/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset +++ b/EndlessVendetta/Content/MetaHumans/Dhruv/BP_Dhruv.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca5941c73008c829ff78317b951a30b360b43bcca9ede2d9ae043f526d654992 -size 458816 +oid sha256:e39c628f74635fd9b8e8911c3ba0f34b6739e84ae5a2d39e9b1c54e0b1ab9403 +size 457290 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset index 113442cd..900fb210 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/4/DF/EI4FFQ2STMC3TRHBQOUNH5.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2af5b43ef0f56d697893c4d4a9377b49297ca7c5289292ebb3c845d67c852b3d -size 123322 +oid sha256:5885a7e31d81ffba0a3bf28ab1a637cdffd3c5147759edb8c13315524369eee6 +size 123293 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset index a617105b..46d921da 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/5/95/31WBX0XWARTHM3RCYSFU9M.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4b583d455754ff09c5d8fba266ee4e244455c55de769842659e50c56eb0fab9 +oid sha256:e0f16f5d8d2fed7e2876116dac5e273f1d9b5ea79fad0042b9ec4d6dd70352b5 size 5644 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset index a4803310..279c9739 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/8/OF/W8X5ON78DR25CQV6QFGJO4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6fc47f6f495a99c14682b0fb16785bd7de5409c96eb2adfa039af0319a750c9 +oid sha256:2d5c9ab9a2df58793d2eaa02532b14b82c9aeed59caab390441f9c9973b5db31 size 5977 diff --git a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset index db7dd2b8..66fd1c98 100644 --- a/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset +++ b/EndlessVendetta/Content/__ExternalActors__/Levels/AITest/B/O6/IM2ZR0FZ5KH20UIRPAQT2P.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fec8b8a97591f3a05ecacb49f14a9949fe6b33c05b62e13dc1c06ce17d1b9cc +oid sha256:32471663a90c365b24ba1d0f9625c4b79cb785c7fd0f036d09549079e6e77345 size 6568 From 72251b6f0db309a8ab5180dae2e257c70481613d Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Thu, 29 Feb 2024 04:33:20 +0000 Subject: [PATCH 8/8] Update Stats UI to Animate Damage --- .../Blueprints/BaseWeapons/WBP_NeedReloadText.uasset | 4 ++-- .../Content/FirstPerson/Blueprints/WBP_Crosshair.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset index d1da95d4..daa31bc7 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72cba357e30cece3b49ba1ca72399b20100afbbddc61af47630f4f08292ecdd8 -size 48684 +oid sha256:649bbaeec1f17b7df76ca85f97bb654fd015f1f60ecc4ad609be522c8c84424d +size 47984 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset index 93b96ec7..4733d876 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05c687aa8ceac4bba8eecd8eedf6ef3f74095d2eacc9d079af5d249a31a77493 -size 102918 +oid sha256:9e63da0bec22702c2595b0f18fcde7736c09338b1942964a304b7c40be4501f8 +size 140987