baz/Nakatomi
baz
/
Nakatomi
1
0
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: baz:deabd0b223883ae59390371221bcda6cbb042255
Branches Tags
baz:master
..
compare: baz:afc30330a7ea244e44bb325f8adf5960340345a8
Branches Tags
baz:master

No commits in common. "deabd0b223883ae59390371221bcda6cbb042255" and "afc30330a7ea244e44bb325f8adf5960340345a8" have entirely different histories.
deabd0b223 ... afc30330a7

8 changed files with 8 additions and 33 deletions
Show Stats Expand all files Collapse all files

BIN
Content/AnimStarterPack/ABP_Manequin.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Throw_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/AnimStarterPack/dash_Montage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Player/PlayerCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
Source/Nakatomi/NakatomiCMC.cpp
View File

@ -384,8 +384,6 @@ void UNakatomiCMC::PerformDash()
FQuat NewRotation = FRotationMatrix::MakeFromXZ(DashDirection, FVector::UpVector).ToQuat(); FQuat NewRotation = FRotationMatrix::MakeFromXZ(DashDirection, FVector::UpVector).ToQuat();
FHitResult Hit; FHitResult Hit;
SafeMoveUpdatedComponent(FVector::ZeroVector, NewRotation, false, Hit); SafeMoveUpdatedComponent(FVector::ZeroVector, NewRotation, false, Hit);
NakatomiCharacterOwner->PlayAnimMontage(Dash_Montage);
SetMovementMode(MOVE_Falling); SetMovementMode(MOVE_Falling);

3
Source/Nakatomi/NakatomiCMC.h
View File

@ -94,9 +94,6 @@ class NAKATOMI_API UNakatomiCMC : public UCharacterMovementComponent
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
float Dash_CooldownDuration = 1.0f; float Dash_CooldownDuration = 1.0f;
UPROPERTY(EditDefaultsOnly)
UAnimMontage* Dash_Montage;
bool Safe_bWantsToSprint; bool Safe_bWantsToSprint;
bool Safe_bWantsToSlide; bool Safe_bWantsToSlide;
bool Safe_bWantsToAds; bool Safe_bWantsToAds;

14
Source/Nakatomi/PlayerCharacter.cpp
View File

@ -703,8 +703,6 @@ void APlayerCharacter::ThrowWeaponCallback()
{ {
if (CurrentWeapon) if (CurrentWeapon)
{ {
PlayAnimMontage(ThrowAnimMontage);
FVector Location; FVector Location;
FVector BoxExtent; FVector BoxExtent;
GetActorBounds(true, Location, BoxExtent, false); GetActorBounds(true, Location, BoxExtent, false);
@ -728,8 +726,6 @@ void APlayerCharacter::ThrowExplosiveCallback()
{ {
if (ThrowableInventory.Num() > 0) if (ThrowableInventory.Num() > 0)
{ {
PlayAnimMontage(ThrowAnimMontage);
FVector Location; FVector Location;
FVector BoxExtent; FVector BoxExtent;
GetActorBounds(true, Location, BoxExtent, false); GetActorBounds(true, Location, BoxExtent, false);
@ -763,13 +759,3 @@ bool APlayerCharacter::GetPressedJump()
{ {
return jumpPressed; return jumpPressed;
} }
bool APlayerCharacter::GetCrouched()
{
if (UNakatomiCMC* cmc = GetCharacterMovementComponent())
{
return cmc->IsCrouching();
}
return false;
}

6
Source/Nakatomi/PlayerCharacter.h
View File

@ -83,9 +83,6 @@ public:
FOnEnemyHitDelegate OnEnemyHit; FOnEnemyHitDelegate OnEnemyHit;
UPROPERTY(EditDefaultsOnly)
UAnimMontage* ThrowAnimMontage;
protected: protected:
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite) UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
float SprintSpeedMultiplier = 2.0f; float SprintSpeedMultiplier = 2.0f;
@ -224,9 +221,6 @@ public:
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
bool GetPressedJump(); bool GetPressedJump();
UFUNCTION(BlueprintCallable)
bool GetCrouched();
protected: protected:
virtual void CalculateHits(TArray<FHitResult>* hits) override; virtual void CalculateHits(TArray<FHitResult>* hits) override;