diff --git a/Content/Blueprints/Characters/Player/BP_ExoPlayerCharacter.uasset b/Content/Blueprints/Characters/Player/BP_ExoPlayerCharacter.uasset index d77fe13..3b39f71 100644 Binary files a/Content/Blueprints/Characters/Player/BP_ExoPlayerCharacter.uasset and b/Content/Blueprints/Characters/Player/BP_ExoPlayerCharacter.uasset differ diff --git a/Content/Models/T-Pose/Animations/CrouchBlend.uasset b/Content/Models/T-Pose/Animations/CrouchBlend.uasset new file mode 100644 index 0000000..8338efc Binary files /dev/null and b/Content/Models/T-Pose/Animations/CrouchBlend.uasset differ diff --git a/Content/Models/T-Pose/Animations/Idle.uasset b/Content/Models/T-Pose/Animations/Idle.uasset new file mode 100644 index 0000000..fb54d8f Binary files /dev/null and b/Content/Models/T-Pose/Animations/Idle.uasset differ diff --git a/Content/Models/T-Pose/Animations/IdleCrouching.uasset b/Content/Models/T-Pose/Animations/IdleCrouching.uasset new file mode 100644 index 0000000..150c14f Binary files /dev/null and b/Content/Models/T-Pose/Animations/IdleCrouching.uasset differ diff --git a/Content/Models/T-Pose/Animations/IdleWalkRunBlend.uasset b/Content/Models/T-Pose/Animations/IdleWalkRunBlend.uasset new file mode 100644 index 0000000..dcc3ad2 Binary files /dev/null and b/Content/Models/T-Pose/Animations/IdleWalkRunBlend.uasset differ diff --git a/Content/Models/T-Pose/Animations/Rifle_Jump.uasset b/Content/Models/T-Pose/Animations/Rifle_Jump.uasset new file mode 100644 index 0000000..7175827 Binary files /dev/null and b/Content/Models/T-Pose/Animations/Rifle_Jump.uasset differ diff --git a/Content/Models/T-Pose/Animations/Running.uasset b/Content/Models/T-Pose/Animations/Running.uasset new file mode 100644 index 0000000..608d10b Binary files /dev/null and b/Content/Models/T-Pose/Animations/Running.uasset differ diff --git a/Content/Models/T-Pose/Animations/WalkCrouchingBackward.uasset b/Content/Models/T-Pose/Animations/WalkCrouchingBackward.uasset new file mode 100644 index 0000000..31a2dc3 Binary files /dev/null and b/Content/Models/T-Pose/Animations/WalkCrouchingBackward.uasset differ diff --git a/Content/Models/T-Pose/Animations/WalkCrouchingForward.uasset b/Content/Models/T-Pose/Animations/WalkCrouchingForward.uasset new file mode 100644 index 0000000..7f57b12 Binary files /dev/null and b/Content/Models/T-Pose/Animations/WalkCrouchingForward.uasset differ diff --git a/Content/Models/T-Pose/Animations/WalkCrouchingLeft.uasset b/Content/Models/T-Pose/Animations/WalkCrouchingLeft.uasset new file mode 100644 index 0000000..592a689 Binary files /dev/null and b/Content/Models/T-Pose/Animations/WalkCrouchingLeft.uasset differ diff --git a/Content/Models/T-Pose/Animations/WalkCrouchingRight.uasset b/Content/Models/T-Pose/Animations/WalkCrouchingRight.uasset new file mode 100644 index 0000000..a564c64 Binary files /dev/null and b/Content/Models/T-Pose/Animations/WalkCrouchingRight.uasset differ diff --git a/Content/Models/T-Pose/Animations/WalkingBackward.uasset b/Content/Models/T-Pose/Animations/WalkingBackward.uasset new file mode 100644 index 0000000..da9b9fe Binary files /dev/null and b/Content/Models/T-Pose/Animations/WalkingBackward.uasset differ diff --git a/Content/Models/T-Pose/Animations/WalkingForward.uasset b/Content/Models/T-Pose/Animations/WalkingForward.uasset new file mode 100644 index 0000000..9797581 Binary files /dev/null and b/Content/Models/T-Pose/Animations/WalkingForward.uasset differ diff --git a/Content/Models/T-Pose/Animations/WalkingLeft.uasset b/Content/Models/T-Pose/Animations/WalkingLeft.uasset new file mode 100644 index 0000000..3b7c6bf Binary files /dev/null and b/Content/Models/T-Pose/Animations/WalkingLeft.uasset differ diff --git a/Content/Models/T-Pose/Animations/WalkingRight.uasset b/Content/Models/T-Pose/Animations/WalkingRight.uasset new file mode 100644 index 0000000..dec530d Binary files /dev/null and b/Content/Models/T-Pose/Animations/WalkingRight.uasset differ diff --git a/Content/Models/T-Pose/PlayerAnimationBP.uasset b/Content/Models/T-Pose/PlayerAnimationBP.uasset new file mode 100644 index 0000000..fd31a52 Binary files /dev/null and b/Content/Models/T-Pose/PlayerAnimationBP.uasset differ diff --git a/Content/Models/T-Pose/T-Pose.uasset b/Content/Models/T-Pose/T-Pose.uasset index 1b22054..e5c14c2 100644 Binary files a/Content/Models/T-Pose/T-Pose.uasset and b/Content/Models/T-Pose/T-Pose.uasset differ diff --git a/Source/Exo/Private/Characters/ExoPlayerCharacter.cpp b/Source/Exo/Private/Characters/ExoPlayerCharacter.cpp index 4b385cd..debe083 100644 --- a/Source/Exo/Private/Characters/ExoPlayerCharacter.cpp +++ b/Source/Exo/Private/Characters/ExoPlayerCharacter.cpp @@ -210,6 +210,7 @@ void AExoPlayerCharacter::CrouchCustom() SetTargetEyeHeight(CrouchedEyeHeight); GetCharacterMovement()->MaxWalkSpeed = CrouchSpeed; bIsCrouched = true; + bIsCrouchingMode = true; CrouchTimeline.Play(); //float CurrentCamHeight = GetCurrentEyeHeight(); @@ -224,6 +225,7 @@ void AExoPlayerCharacter::TryUnCrouchCustom() SetTargetEyeHeight(StandingEyeHeight); GetCharacterMovement()->MaxWalkSpeed = WalkSpeed; bIsCrouched = false; + bIsCrouchingMode = false; CrouchTimeline.Reverse(); //float CurrentCamHeight = GetCurrentEyeHeight(); diff --git a/Source/Exo/Public/Characters/ExoPlayerCharacter.h b/Source/Exo/Public/Characters/ExoPlayerCharacter.h index 37c6aa7..7cd054f 100644 --- a/Source/Exo/Public/Characters/ExoPlayerCharacter.h +++ b/Source/Exo/Public/Characters/ExoPlayerCharacter.h @@ -48,10 +48,10 @@ public: UPROPERTY(EditAnywhere, Category = "Slide Properties") float SlideCooldown = 0.35f; - UPROPERTY(EditAnywhere, Category = "Movement Properties") + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Movement Properties") float WalkSpeed = 600.0f; - UPROPERTY(EditAnywhere, Category = "Movement Properties") + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Movement Properties") float SprintSpeed = 1500.0f; UPROPERTY(EditAnywhere, Category = "Movement Properties") @@ -63,6 +63,9 @@ public: UPROPERTY(EditAnywhere, Category = "Aiming") float bIsAimingMode = false; + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Crouch") + bool bIsCrouchingMode = false; + UPROPERTY(EditAnywhere, Category = "Health") float CurrentHealth = 50.0f;