Merge New Animations #2
Content
AnimStarterPack
Aim_Space_Hip.uassetAim_Space_Ironsights.uassetBS_CrouchWalk.uassetBS_Jog.uassetCrouch_Idle_Rifle_Hip.uassetCrouch_Idle_Rifle_Ironsights.uassetCrouch_Walk_Bwd_Rifle_Hip.uassetCrouch_Walk_Bwd_Rifle_Ironsights.uassetCrouch_Walk_Fwd_Rifle_Hip.uassetCrouch_Walk_Fwd_Rifle_Ironsights.uassetCrouch_Walk_Lt_Rifle_Hip.uassetCrouch_Walk_Lt_Rifle_Ironsights.uassetCrouch_Walk_Rt_Rifle_Hip.uassetCrouch_Walk_Rt_Rifle_Ironsights.uassetCrouch_to_Stand_Rifle_Hip.uassetCrouch_to_Stand_Rifle_Ironsights.uassetDeath_1.uassetDeath_2.uassetDeath_3.uassetDeath_Ironsights_1.uassetDeath_Ironsights_2.uassetEquip_Pistol_Standing.uassetEquip_Rifle_Standing.uassetFire_Rifle_Hip.uassetFire_Rifle_Ironsights.uassetFire_Shotgun_Hip.uassetFire_Shotgun_Ironsights.uassetHit_React_1.uassetHit_React_2.uassetHit_React_3.uassetHit_React_4.uassetIdle_Pistol.uassetIdle_Rifle_Hip.uassetIdle_Rifle_Hip_Break1.uassetIdle_Rifle_Hip_Break2.uassetIdle_Rifle_Ironsights.uassetJog_Bwd_Rifle.uassetJog_Fwd_Rifle.uassetJog_Lt_Rifle.uassetJog_Rt_Rifle.uassetJump_From_Jog.uassetJump_From_Stand.uassetJump_From_Stand_Ironsights.uassetProne_Death_1.uassetProne_Death_2.uassetProne_Fire_1.uassetProne_Fire_2.uassetProne_Idle.uassetProne_Reload_Rifle.uassetProne_Reload_Shotgun.uassetProne_To_Stand.uassetReload_Pistol.uassetReload_Rifle_Hip.uassetReload_Rifle_Ironsights.uassetReload_Shotgun_Hip.uassetReload_Shotgun_Ironsights.uassetShowcase.umapSprint_Fwd_Rifle.uassetStand_To_Prone.uassetStand_to_Crouch_Rifle_Hip.uassetStand_to_Crouch_Rifle_Ironsights.uassetUE4ASP_HeroTPP_AnimBlueprint.uasset
UE4_Mannequin
Walk_Bwd_Rifle_Ironsights.uassetWalk_Fwd_Rifle_Ironsights.uassetWalk_Lt_Rifle_Ironsights.uassetWalk_Rt_Rifle_Ironsights.uassetPlayer
Source/Nakatomi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/AnimStarterPack/Crouch_to_Stand_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/Crouch_to_Stand_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/AnimStarterPack/Stand_to_Crouch_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/Stand_to_Crouch_Rifle_Ironsights.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_Body.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_Body.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_ChestLogo.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_ChestLogo.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_GlossyBlack_Latex_UE4.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_GlossyBlack_Latex_UE4.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige_LOGO.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige_LOGO.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_SoftMetal_UE4.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_SoftMetal_UE4.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01_N.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01_N.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_D.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_D.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_N.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_N.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_PhysicsAsset.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_PhysicsAsset.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4Man_Logo_N.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4Man_Logo_N.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_LOGO_CARD.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_LOGO_CARD.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_MAT_MASKA.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_MAT_MASKA.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin__normals.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin__normals.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_occlusion_Mobile.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_occlusion_Mobile.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Player/PlayerCharacter.uasset (Stored with Git LFS)
BIN
Content/Player/PlayerCharacter.uasset (Stored with Git LFS)
Binary file not shown.
|
@ -139,7 +139,8 @@ void APlayerCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCom
|
|||
|
||||
if (JumpAction)
|
||||
{
|
||||
Input->BindAction(JumpAction, ETriggerEvent::Triggered, this, &APlayerCharacter::JumpCallback);
|
||||
Input->BindAction(JumpAction, ETriggerEvent::Started, this, &APlayerCharacter::BeginJumpCallback);
|
||||
Input->BindAction(JumpAction, ETriggerEvent::Completed, this, &APlayerCharacter::EndJumpCallback);
|
||||
}
|
||||
|
||||
if (FireAction)
|
||||
|
@ -231,9 +232,16 @@ void APlayerCharacter::LookCallback(const FInputActionInstance& Instance)
|
|||
}
|
||||
}
|
||||
|
||||
void APlayerCharacter::JumpCallback(const FInputActionInstance& Instance)
|
||||
void APlayerCharacter::BeginJumpCallback(const FInputActionInstance& Instance)
|
||||
{
|
||||
Jump();
|
||||
jumpPressed = true;
|
||||
}
|
||||
|
||||
void APlayerCharacter::EndJumpCallback(const FInputActionInstance& Instance)
|
||||
{
|
||||
StopJumping();
|
||||
jumpPressed = false;
|
||||
}
|
||||
|
||||
void APlayerCharacter::BeginFireCallback(const FInputActionInstance& Instance)
|
||||
|
@ -741,4 +749,9 @@ AThrowable* APlayerCharacter::ThrowThrowable()
|
|||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
bool APlayerCharacter::GetPressedJump()
|
||||
{
|
||||
return jumpPressed;
|
||||
}
|
||||
|
|
|
@ -131,6 +131,8 @@ private:
|
|||
|
||||
UPROPERTY(EditDefaultsOnly)
|
||||
USoundBase* HitMarkerSound;
|
||||
|
||||
bool jumpPressed = false;
|
||||
|
||||
public:
|
||||
// Sets default values for this character's properties
|
||||
|
@ -153,7 +155,9 @@ public:
|
|||
|
||||
void LookCallback(const FInputActionInstance& Instance);
|
||||
|
||||
void JumpCallback(const FInputActionInstance& Instance);
|
||||
void BeginJumpCallback(const FInputActionInstance& Instance);
|
||||
|
||||
void EndJumpCallback(const FInputActionInstance& Instance);
|
||||
|
||||
void BeginFireCallback(const FInputActionInstance& Instance);
|
||||
|
||||
|
@ -212,6 +216,9 @@ public:
|
|||
|
||||
AThrowable* ThrowThrowable();
|
||||
|
||||
UFUNCTION(BlueprintCallable)
|
||||
bool GetPressedJump();
|
||||
|
||||
protected:
|
||||
virtual void CalculateHits(TArray<FHitResult>* hits) override;
|
||||
|
||||
|
|
Loading…
Reference in New Issue