Merge New Animations #2
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)
|
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)
|
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();
|
Jump();
|
||||||
|
jumpPressed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void APlayerCharacter::EndJumpCallback(const FInputActionInstance& Instance)
|
||||||
|
{
|
||||||
|
StopJumping();
|
||||||
|
jumpPressed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void APlayerCharacter::BeginFireCallback(const FInputActionInstance& Instance)
|
void APlayerCharacter::BeginFireCallback(const FInputActionInstance& Instance)
|
||||||
|
@ -742,3 +750,8 @@ AThrowable* APlayerCharacter::ThrowThrowable()
|
||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool APlayerCharacter::GetPressedJump()
|
||||||
|
{
|
||||||
|
return jumpPressed;
|
||||||
|
}
|
||||||
|
|
|
@ -132,6 +132,8 @@ private:
|
||||||
UPROPERTY(EditDefaultsOnly)
|
UPROPERTY(EditDefaultsOnly)
|
||||||
USoundBase* HitMarkerSound;
|
USoundBase* HitMarkerSound;
|
||||||
|
|
||||||
|
bool jumpPressed = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Sets default values for this character's properties
|
// Sets default values for this character's properties
|
||||||
APlayerCharacter(const FObjectInitializer& ObjectInitializer);
|
APlayerCharacter(const FObjectInitializer& ObjectInitializer);
|
||||||
|
@ -153,7 +155,9 @@ public:
|
||||||
|
|
||||||
void LookCallback(const FInputActionInstance& Instance);
|
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);
|
void BeginFireCallback(const FInputActionInstance& Instance);
|
||||||
|
|
||||||
|
@ -212,6 +216,9 @@ public:
|
||||||
|
|
||||||
AThrowable* ThrowThrowable();
|
AThrowable* ThrowThrowable();
|
||||||
|
|
||||||
|
UFUNCTION(BlueprintCallable)
|
||||||
|
bool GetPressedJump();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void CalculateHits(TArray<FHitResult>* hits) override;
|
virtual void CalculateHits(TArray<FHitResult>* hits) override;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue