Compare commits

..

No commits in common. "d96a5c837a949262f839f36b331a6023a10b3616" and "f84a8d097459755f10a822820f8ca0c8b3066b65" have entirely different histories.

100 changed files with 8 additions and 341 deletions

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/BS_Walk.uasset (Stored with Git LFS)

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/Death_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/AnimStarterPack/Death_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/AnimStarterPack/Death_3.uasset (Stored with Git LFS)

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/Hit_React_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/AnimStarterPack/Hit_React_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/AnimStarterPack/Hit_React_3.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/AnimStarterPack/Hit_React_4.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/AnimStarterPack/Idle_Pistol.uasset (Stored with Git LFS)

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/Prone_Idle.uasset (Stored with Git LFS)

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/Showcase.umap (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/AnimStarterPack/Throw.uasset (Stored with Git LFS)

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/dash.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Levels/Animation.umap (Stored with Git LFS)

Binary file not shown.

BIN
Content/Levels/TestLevel.umap (Stored with Git LFS)

Binary file not shown.

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

Binary file not shown.

View File

@ -385,8 +385,6 @@ void UNakatomiCMC::PerformDash()
FHitResult Hit;
SafeMoveUpdatedComponent(FVector::ZeroVector, NewRotation, false, Hit);
NakatomiCharacterOwner->PlayAnimMontage(Dash_Montage);
SetMovementMode(MOVE_Falling);
DashStartDelegate.Broadcast();

View File

@ -94,9 +94,6 @@ 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;

View File

@ -139,8 +139,7 @@ void APlayerCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputCom
if (JumpAction)
{
Input->BindAction(JumpAction, ETriggerEvent::Started, this, &APlayerCharacter::BeginJumpCallback);
Input->BindAction(JumpAction, ETriggerEvent::Completed, this, &APlayerCharacter::EndJumpCallback);
Input->BindAction(JumpAction, ETriggerEvent::Triggered, this, &APlayerCharacter::JumpCallback);
}
if (FireAction)
@ -232,16 +231,9 @@ void APlayerCharacter::LookCallback(const FInputActionInstance& Instance)
}
}
void APlayerCharacter::BeginJumpCallback(const FInputActionInstance& Instance)
void APlayerCharacter::JumpCallback(const FInputActionInstance& Instance)
{
Jump();
jumpPressed = true;
}
void APlayerCharacter::EndJumpCallback(const FInputActionInstance& Instance)
{
StopJumping();
jumpPressed = false;
}
void APlayerCharacter::BeginFireCallback(const FInputActionInstance& Instance)
@ -299,8 +291,6 @@ void APlayerCharacter::SetSprintingCallback(const FInputActionInstance& Instance
{
cmc->EnableSprint();
}
IsSprinting = true;
}
void APlayerCharacter::SetWalkingCallback(const FInputActionInstance& Instance)
@ -309,8 +299,6 @@ void APlayerCharacter::SetWalkingCallback(const FInputActionInstance& Instance)
{
cmc->DisableSprint();
}
IsSprinting = false;
}
void APlayerCharacter::CalculateHits(TArray<FHitResult>* hits)
@ -703,8 +691,6 @@ void APlayerCharacter::ThrowWeaponCallback()
{
if (CurrentWeapon)
{
PlayAnimMontage(ThrowAnimMontage);
FVector Location;
FVector BoxExtent;
GetActorBounds(true, Location, BoxExtent, false);
@ -728,8 +714,6 @@ void APlayerCharacter::ThrowExplosiveCallback()
{
if (ThrowableInventory.Num() > 0)
{
PlayAnimMontage(ThrowAnimMontage);
FVector Location;
FVector BoxExtent;
GetActorBounds(true, Location, BoxExtent, false);
@ -758,18 +742,3 @@ AThrowable* APlayerCharacter::ThrowThrowable()
return nullptr;
}
bool APlayerCharacter::GetPressedJump()
{
return jumpPressed;
}
bool APlayerCharacter::GetCrouched()
{
if (UNakatomiCMC* cmc = GetCharacterMovementComponent())
{
return cmc->IsCrouching();
}
return false;
}

View File

@ -83,9 +83,6 @@ public:
FOnEnemyHitDelegate OnEnemyHit;
UPROPERTY(EditDefaultsOnly)
UAnimMontage* ThrowAnimMontage;
protected:
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
float SprintSpeedMultiplier = 2.0f;
@ -124,10 +121,8 @@ 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;
@ -137,8 +132,6 @@ private:
UPROPERTY(EditDefaultsOnly)
USoundBase* HitMarkerSound;
bool jumpPressed = false;
public:
// Sets default values for this character's properties
APlayerCharacter(const FObjectInitializer& ObjectInitializer);
@ -160,9 +153,7 @@ public:
void LookCallback(const FInputActionInstance& Instance);
void BeginJumpCallback(const FInputActionInstance& Instance);
void EndJumpCallback(const FInputActionInstance& Instance);
void JumpCallback(const FInputActionInstance& Instance);
void BeginFireCallback(const FInputActionInstance& Instance);
@ -221,12 +212,6 @@ public:
AThrowable* ThrowThrowable();
UFUNCTION(BlueprintCallable)
bool GetPressedJump();
UFUNCTION(BlueprintCallable)
bool GetCrouched();
protected:
virtual void CalculateHits(TArray<FHitResult>* hits) override;