Merge pull request 'Merge New Animations' (#2) from animations-mk2 into master
Reviewed-on: #2
This commit is contained in:
commit
d96a5c837a
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/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.
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_CtrlRig.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_CtrlRig.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_CtrlRig_Take1.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_CtrlRig_Take1.uasset (Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_CtrlRig_Take2.uasset (Stored with Git LFS)
Normal file
BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_CtrlRig_Take2.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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Content/Levels/TestLevel.umap (Stored with Git LFS)
BIN
Content/Levels/TestLevel.umap (Stored with Git LFS)
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.
|
@ -384,6 +384,8 @@ void UNakatomiCMC::PerformDash()
|
|||
FQuat NewRotation = FRotationMatrix::MakeFromXZ(DashDirection, FVector::UpVector).ToQuat();
|
||||
FHitResult Hit;
|
||||
SafeMoveUpdatedComponent(FVector::ZeroVector, NewRotation, false, Hit);
|
||||
|
||||
NakatomiCharacterOwner->PlayAnimMontage(Dash_Montage);
|
||||
|
||||
SetMovementMode(MOVE_Falling);
|
||||
|
||||
|
|
|
@ -94,6 +94,9 @@ class NAKATOMI_API UNakatomiCMC : public UCharacterMovementComponent
|
|||
UPROPERTY(EditDefaultsOnly)
|
||||
float Dash_CooldownDuration = 1.0f;
|
||||
|
||||
UPROPERTY(EditDefaultsOnly)
|
||||
UAnimMontage* Dash_Montage;
|
||||
|
||||
bool Safe_bWantsToSprint;
|
||||
bool Safe_bWantsToSlide;
|
||||
bool Safe_bWantsToAds;
|
||||
|
|
|
@ -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)
|
||||
|
@ -291,6 +299,8 @@ void APlayerCharacter::SetSprintingCallback(const FInputActionInstance& Instance
|
|||
{
|
||||
cmc->EnableSprint();
|
||||
}
|
||||
|
||||
IsSprinting = true;
|
||||
}
|
||||
|
||||
void APlayerCharacter::SetWalkingCallback(const FInputActionInstance& Instance)
|
||||
|
@ -299,6 +309,8 @@ void APlayerCharacter::SetWalkingCallback(const FInputActionInstance& Instance)
|
|||
{
|
||||
cmc->DisableSprint();
|
||||
}
|
||||
|
||||
IsSprinting = false;
|
||||
}
|
||||
|
||||
void APlayerCharacter::CalculateHits(TArray<FHitResult>* hits)
|
||||
|
@ -691,6 +703,8 @@ void APlayerCharacter::ThrowWeaponCallback()
|
|||
{
|
||||
if (CurrentWeapon)
|
||||
{
|
||||
PlayAnimMontage(ThrowAnimMontage);
|
||||
|
||||
FVector Location;
|
||||
FVector BoxExtent;
|
||||
GetActorBounds(true, Location, BoxExtent, false);
|
||||
|
@ -714,6 +728,8 @@ void APlayerCharacter::ThrowExplosiveCallback()
|
|||
{
|
||||
if (ThrowableInventory.Num() > 0)
|
||||
{
|
||||
PlayAnimMontage(ThrowAnimMontage);
|
||||
|
||||
FVector Location;
|
||||
FVector BoxExtent;
|
||||
GetActorBounds(true, Location, BoxExtent, false);
|
||||
|
@ -741,4 +757,19 @@ AThrowable* APlayerCharacter::ThrowThrowable()
|
|||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
bool APlayerCharacter::GetPressedJump()
|
||||
{
|
||||
return jumpPressed;
|
||||
}
|
||||
|
||||
bool APlayerCharacter::GetCrouched()
|
||||
{
|
||||
if (UNakatomiCMC* cmc = GetCharacterMovementComponent())
|
||||
{
|
||||
return cmc->IsCrouching();
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -83,6 +83,9 @@ public:
|
|||
|
||||
FOnEnemyHitDelegate OnEnemyHit;
|
||||
|
||||
UPROPERTY(EditDefaultsOnly)
|
||||
UAnimMontage* ThrowAnimMontage;
|
||||
|
||||
protected:
|
||||
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
|
||||
float SprintSpeedMultiplier = 2.0f;
|
||||
|
@ -121,8 +124,10 @@ private:
|
|||
UPROPERTY(EditAnywhere, BlueprintReadWrite, Meta = (AllowPrivateAccess = "true"))
|
||||
UAIPerceptionStimuliSourceComponent* PerceptionSource;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Meta = (AllowPrivateAccess = "true"))
|
||||
bool IsSprinting = false;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, Meta = (AllowPrivateAccess = "true"))
|
||||
bool IsADS = false;
|
||||
|
||||
float AimSensitivity;
|
||||
|
@ -131,6 +136,8 @@ private:
|
|||
|
||||
UPROPERTY(EditDefaultsOnly)
|
||||
USoundBase* HitMarkerSound;
|
||||
|
||||
bool jumpPressed = false;
|
||||
|
||||
public:
|
||||
// Sets default values for this character's properties
|
||||
|
@ -153,7 +160,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 +221,12 @@ public:
|
|||
|
||||
AThrowable* ThrowThrowable();
|
||||
|
||||
UFUNCTION(BlueprintCallable)
|
||||
bool GetPressedJump();
|
||||
|
||||
UFUNCTION(BlueprintCallable)
|
||||
bool GetCrouched();
|
||||
|
||||
protected:
|
||||
virtual void CalculateHits(TArray<FHitResult>* hits) override;
|
||||
|
||||
|
|
Loading…
Reference in New Issue