From b53a2af8cea80c95fc66ca273fae84c3b438155c Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 12 Dec 2023 11:39:25 +0000 Subject: [PATCH 1/3] Added Idle, Sprint, Walk, OutOfStam Camera Anims --- .../FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset | 4 ++-- .../Blueprints/BaseWeapons/BP_GunCameraShake.uasset | 4 ++-- .../Blueprints/HeadBobbingEffect/CameraShake_Idle.uasset | 3 +++ .../Blueprints/HeadBobbingEffect/CameraShake_OutOfStam.uasset | 3 +++ .../Blueprints/HeadBobbingEffect/CameraShake_Sprint.uasset | 3 +++ .../Blueprints/HeadBobbingEffect/CameraShake_Walk.uasset | 3 +++ 6 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Idle.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_OutOfStam.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Sprint.uasset create mode 100644 EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Walk.uasset diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset index af5ea1b4..327dae54 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e1e829f4770985384af4baf7f94ed5089f11e12ec69b2ec09fb5f193a1ab960 -size 124465 +oid sha256:1e9217667c6560bc2ec620effa164ebf76834a0551a1036ca9e30305a5bca1f5 +size 124543 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_GunCameraShake.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_GunCameraShake.uasset index cc04228d..f570bf8e 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_GunCameraShake.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/BP_GunCameraShake.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4358c8520e164b973fae2ae1a18307f0eb691ecfd94b433cbda1052b8b2751fa -size 7209 +oid sha256:c17011787947edd0492999385adc17e76b12aa4fe03ef946ae96b2ad435f4eda +size 9114 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Idle.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Idle.uasset new file mode 100644 index 00000000..451728d5 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4edc2f6d9b0bde40c02ba5fec57f3f08573add14e1d62bbed4e4cb33a74f73a +size 7217 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_OutOfStam.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_OutOfStam.uasset new file mode 100644 index 00000000..c8468545 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_OutOfStam.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e7640dc1229f02365ed721ad413a620bf85e1a1280a08cec8b56e499f7820af +size 6830 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Sprint.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Sprint.uasset new file mode 100644 index 00000000..929d8476 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Sprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9231f702f7fffdfe9f4bd9024bcb549a148dd6d9a4410f55475f6445d0a432 +size 6791 diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Walk.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Walk.uasset new file mode 100644 index 00000000..7b388294 --- /dev/null +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/HeadBobbingEffect/CameraShake_Walk.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0465ca03bf373461df13d58cf2ad596af380542610db4f3a151a91128482be61 +size 6765 From 3395c2083aca2c3694c6b6c35bd3fd875faeb643 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 12 Dec 2023 11:39:37 +0000 Subject: [PATCH 2/3] Setup Functionality for use of new Animations --- .../FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index ea9b685a..da2ebfc0 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58139ccad1a63dd9fa03404f0fb0b7af3f742d844b0ed7da0e081b96319600b9 -size 54773 +oid sha256:ad0ae20e5303a3fe8c408d0c82d6c1c660c27a857c3f466918550a803b21cd6c +size 113048 From cdac36f359f43d81ed017a295bedc963807a55fb Mon Sep 17 00:00:00 2001 From: MH261677 Date: Tue, 12 Dec 2023 11:39:52 +0000 Subject: [PATCH 3/3] Fixed More FOV issues and removed FOV when Sprinting --- EndlessVendetta/Content/Levels/TrainingFacility.umap | 2 +- .../Source/EndlessVendetta/EndlessVendettaCharacter.cpp | 5 ----- .../Source/EndlessVendetta/EndlessVendettaCharacter.h | 3 ++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 174ac378..bc768da8 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7711a7f6afcfd75419a73d627b6359ec3fb76c48d9dbb34e50b2a2318ee05b7d +oid sha256:bb646d54518a71e888f0accb0e1de76627bc4352cc2c1b65312eec17fbd42c6f size 679380 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 438d89e8..66984a2a 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -86,7 +86,6 @@ void AEndlessVendettaCharacter::Tick(float DeltaTime) } else if (MoveGroundSpeed <= 0) { - this->GetFirstPersonCameraComponent()->SetFieldOfView(90); bIsPlayerMoving = false; } if (bPressedJump) @@ -105,7 +104,6 @@ void AEndlessVendettaCharacter::Tick(float DeltaTime) if (CurrentStamina <= 0.0f) { bIsPlayerSprinting = false; - this->GetFirstPersonCameraComponent()->SetFieldOfView(90); CurrentStamina = 0.0f; CharacterMovement->MaxWalkSpeed = OriginalWalkSpeed; } @@ -554,7 +552,6 @@ void AEndlessVendettaCharacter::Sprint() if (MoveGroundSpeed > 0) { CharacterMovement->MaxWalkSpeed = SprintSpeed; - this->GetFirstPersonCameraComponent()->SetFieldOfView(100); } } } @@ -566,7 +563,6 @@ void AEndlessVendettaCharacter::StopSprint() { UE_LOG(LogTemp, Display, TEXT("Player stopped sprinting")); CharacterMovement->MaxWalkSpeed = OriginalWalkSpeed; - this->GetFirstPersonCameraComponent()->SetFieldOfView(90); } } @@ -590,7 +586,6 @@ void AEndlessVendettaCharacter::Jumping() void AEndlessVendettaCharacter::StopJump() { Super::StopJumping(); - UE_LOG(LogTemp, Display, TEXT("Player has stopped jumping")); bHasPlayerJumped = false; } diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 8bfa7c05..2fa0e06f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -127,7 +127,7 @@ public: bool bIsPlayerMoving = false; - UPROPERTY(VisibleAnywhere) + UPROPERTY(VisibleAnywhere, BlueprintReadWrite) bool bIsPlayerSprinting = false; double MoveGroundSpeed; @@ -177,6 +177,7 @@ public: void Jumping(); void StopJump(); + UPROPERTY(BlueprintReadWrite) bool bHasPlayerJumped = false; UArrowComponent* ScopedLocationArrow;