diff --git a/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset b/EndlessVendetta/Content/AI/Enemy/Basic/BP_BasicEnemyCharacterSwat.uasset index 222940e8..31b4d200 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:1902cd971a6a15731d4b924f40519e2db262aa0a0ba32d02c4cf96f3adf42eca -size 184766 +oid sha256:bc526ac1f566a4730a0086c407a6a34ea86db835266318cf7fd54bbc7c7d7c9d +size 187581 diff --git a/EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset b/EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset index d306f801..38c3cbd7 100644 --- a/EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset +++ b/EndlessVendetta/Content/AI/PartyCrowd/Base/BP_PartyArea.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c9c3b773938c1b10edd0ea8d8ab843f89493134e130707c54926e2ef6a7eb06 -size 63380 +oid sha256:ca9dd6fc3e8c3832877edfcb1770e2022251ef98009d8d808c372cbf13f115e0 +size 63775 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_NonShootableTarget.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_NonShootableTarget.uasset index 5a480fff..68f4e0cb 100644 --- a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_NonShootableTarget.uasset +++ b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_NonShootableTarget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa7e64202b6d6196179e99a14a33f8cc6e02cd75dc74d49e52149874c9a6eef9 -size 71048 +oid sha256:144530224fe0e6b7ac7b386eadb90b0ce2aceb712768e3300d6a97c15643e260 +size 70432 diff --git a/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset b/EndlessVendetta/Content/BountySystem/ControlsTutorial/GunRangeMechanics/Target/BP_Target.uasset index 50e84f33..47320d38 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:6fc7c50381ecef344c02fce37526cf44de06d07d0bdc4e697ef4ec30e8f0e8f4 -size 98315 +oid sha256:a51cd66352a862ed14de3a3d350f840e58235176275f91698c82388733bb0e94 +size 99327 diff --git a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset index e8f7717a..754b8e55 100644 --- a/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset +++ b/EndlessVendetta/Content/Gadgets/CombatGadgets/HeatBlast/CG_HeatBlast.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50cd916d2ece35e54e277f9cb92ccd59ac13cfca7d8c524a28b3246f465b8b49 -size 147055 +oid sha256:b2bff27a79e4ff08a6bf9f9e02924759dd94dda95a15f354df15bcffffa325d1 +size 148104 diff --git a/EndlessVendetta/Content/Levels/Apartment_hit.umap b/EndlessVendetta/Content/Levels/Apartment_hit.umap index 58a4e468..f32242ed 100644 --- a/EndlessVendetta/Content/Levels/Apartment_hit.umap +++ b/EndlessVendetta/Content/Levels/Apartment_hit.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e05d9871855045d53df3ca2c158535b7eb74c7dc9120a45374eff5368c1b40 -size 864249 +oid sha256:b5f99f805ea6d5c4313ab7825792a2f68df668a604805bccc96d342897503e80 +size 864373 diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index d814760b..c2a34afc 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:765f5e8e8749ed76d2ff8ecd445da829ab700236335db74a90a01217185bf66b -size 14831 +oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 +size 14948 diff --git a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset index bf2e4391..59734052 100644 --- a/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset +++ b/EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d -size 43456 +oid sha256:25f5aabb2a4a2766e46fddef667521bdc38fd7a47dfa4761fac04a61b78f0bbc +size 53268 diff --git a/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp b/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp index 1abd0508..d6aa57fb 100644 --- a/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/AI/Tasks/BTTask_AttackPlayer.cpp @@ -37,7 +37,7 @@ EBTNodeResult::Type UBTTask_AttackPlayer::ExecuteTask(UBehaviorTreeComponent& Ow FCollisionObjectQueryParams ObjectQueryParams; ObjectQueryParams.AddObjectTypesToQuery(ECC_Pawn); ObjectQueryParams.AddObjectTypesToQuery(ECC_WorldStatic); - ObjectQueryParams.AddObjectTypesToQuery(ECC_WorldDynamic); + //ObjectQueryParams.AddObjectTypesToQuery(ECC_WorldDynamic); if (FHitResult HitResult; GetWorld()->LineTraceSingleByObjectType(HitResult, Start, End, ObjectQueryParams, QueryParams)) { if (IsValid(HitResult.GetActor())) diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp index c3266efb..a6c43f0c 100644 --- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp @@ -188,7 +188,7 @@ void ABaseWeaponClass::Fire() FCollisionObjectQueryParams ObjectQueryParams; ObjectQueryParams.AddObjectTypesToQuery(ECC_Pawn); ObjectQueryParams.AddObjectTypesToQuery(ECC_WorldStatic); - ObjectQueryParams.AddObjectTypesToQuery(ECC_WorldDynamic); + //ObjectQueryParams.AddObjectTypesToQuery(ECC_WorldDynamic); GetWorld()->LineTraceSingleByObjectType(outHit, traceStart, traceEnd, ObjectQueryParams, collisionParams); WeaponFired.Broadcast(); playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1);