Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge remote-tracking branch 'origin/Animation' into Polishing-Checkpoints

Browse Source
This commit is contained in:
Rafal Swierczek 2024-05-11 13:22:50 +01:00
commit 29e061a9e6
12 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Arms/FP_Rifle_Reload_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/Animations/Rifle/AssaultRifle_Anims_Reload.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/Assault_Rifle/BP_AssaultRifle.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/AnimatedPistol/ArmsAnimations/ABP_Arms.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/Pistol_Assets/BP_HandGun_Projectile.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/WBP_Crosshair.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/FirstPersonArms/Character/Mesh/SK_Mannequin_Arms_Skeleton.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/D/OU/O2HH4HR7YM08QPG8R3YF3R.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
View File

@ -108,6 +108,7 @@ void AEndlessVendettaCharacter::ReloadAnimationComplete()
{ {
if (IsValid(PrimaryWeapon)) if (IsValid(PrimaryWeapon))
{ {
if (!bIsReloading) return;
PrimaryWeapon->WeaponReload(); PrimaryWeapon->WeaponReload();
} }
if (IsValid(SecondaryWeapon)) if (IsValid(SecondaryWeapon))
@ -760,7 +761,8 @@ void AEndlessVendettaCharacter::GunReload()
if (IsValid(PrimaryWeapon)) if (IsValid(PrimaryWeapon))
{ {
if (PrimaryWeapon->currentAmmoCount == PrimaryWeapon->MagazineSize) return; if (PrimaryWeapon->currentAmmoCount == PrimaryWeapon->MagazineSize) return;
PrimaryWeapon->ReloadTimer(); StartReload.Broadcast();
//PrimaryWeapon->ReloadTimer();
bIsReloading = true; bIsReloading = true;
} }
else if (IsValid(SecondaryWeapon)) else if (IsValid(SecondaryWeapon))

3
EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
View File

@ -200,7 +200,8 @@ void ABaseWeaponClass::Fire()
GetWorld()->LineTraceSingleByObjectType(outHit, traceStart, traceEnd, ObjectQueryParams, collisionParams); GetWorld()->LineTraceSingleByObjectType(outHit, traceStart, traceEnd, ObjectQueryParams, collisionParams);
WeaponFired.Broadcast(); WeaponFired.Broadcast();
playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1); playerControllerRef->PlayerCameraManager->StartCameraShake(CameraShakeClass, 1);
endlessVendettaChar->PawnNoiseEmitterComp->MakeNoise(endlessVendettaChar, 1, traceStart); //LITERALLY CHANGE THIS FOR SUPPRESSOR AND IT SHOULD WORK LOL endlessVendettaChar->PawnNoiseEmitterComp->MakeNoise(endlessVendettaChar, 1, traceStart);
//LITERALLY CHANGE THIS FOR SUPPRESSOR AND IT SHOULD WORK LOL
currentAmmoCount -= 1; currentAmmoCount -= 1;
GenerateRecoilVector(); GenerateRecoilVector();
ClickDetectionTimer(); ClickDetectionTimer();