Compare commits
No commits in common. "3d290b3ca1e2b1b5d8cf081a97fdcf71ad4f8e4f" and "221d31fb85816ef0200fe98e61c0a0ef12273618" have entirely different histories.
3d290b3ca1
...
221d31fb85
BIN
Content/Assets/CorridoorAssets/M_SciFiMat.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/M_SciFiMat.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/PolygonSciFiCity_Texture_Metallic.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/PolygonSciFiCity_Texture_Metallic.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/PolygonSciFiCity_Texture_Normal.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/PolygonSciFiCity_Texture_Normal.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/PolygonSciFi_Road_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/PolygonSciFi_Road_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/PolygonScifi_01_A.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/PolygonScifi_01_A.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/PolygonScifi_Emissive_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/PolygonScifi_Emissive_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Bld_Section_Door_07_Door.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Bld_Section_Door_07_Door.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_02.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_02.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_03.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_03.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_04.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_04.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_05.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Env_Graffiti_Wall_05.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Env_Ground_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Env_Ground_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Env_Small_Rocks_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Env_Small_Rocks_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Env_Small_Rocks_02.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Env_Small_Rocks_02.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_AirConditioningGrid_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_AirConditioningGrid_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_AirConditioningUnit_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_AirConditioningUnit_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_AirConditioningUnit_02.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_AirConditioningUnit_02.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Barrier_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Barrier_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Barrier_02.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Barrier_02.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Barrier_03.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Barrier_03.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_ChargingStation_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_ChargingStation_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_01.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_01_Lid.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_01_Lid.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_02.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_02.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_02_Lid.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_02_Lid.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_03.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_03.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_03_Lid.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Crate_Military_03_Lid.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Door_02.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Door_02.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Door_03.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Door_03.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Door_03_Glass.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Door_03_Glass.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Assets/CorridoorAssets/SM_Prop_Door_04.uasset
(Stored with Git LFS)
BIN
Content/Assets/CorridoorAssets/SM_Prop_Door_04.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/ThomasLabRooms/BP_TeleporterCube.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/ThomasLabRooms/BP_TeleporterCube.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemies/Flats/BP_FlatsMonster.uasset
(Stored with Git LFS)
BIN
Content/Enemies/Flats/BP_FlatsMonster.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemies/Small/AI_SmallEnemy.uasset
(Stored with Git LFS)
BIN
Content/Enemies/Small/AI_SmallEnemy.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemies/Small/BB_SmallEnemy.uasset
(Stored with Git LFS)
BIN
Content/Enemies/Small/BB_SmallEnemy.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemies/Small/BP_SmallEnemy.uasset
(Stored with Git LFS)
BIN
Content/Enemies/Small/BP_SmallEnemy.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemies/Small/BTT_AdjustSpeed.uasset
(Stored with Git LFS)
BIN
Content/Enemies/Small/BTT_AdjustSpeed.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemies/Small/BTT_Attack.uasset
(Stored with Git LFS)
BIN
Content/Enemies/Small/BTT_Attack.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemies/Small/BTT_FindRandomLoc.uasset
(Stored with Git LFS)
BIN
Content/Enemies/Small/BTT_FindRandomLoc.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Enemies/Small/BT_SmallEnemy.uasset
(Stored with Git LFS)
BIN
Content/Enemies/Small/BT_SmallEnemy.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
(Stored with Git LFS)
BIN
Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/PrototypeLevel.umap
(Stored with Git LFS)
BIN
Content/Levels/PrototypeLevel.umap
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/PrototypeLevelRework.umap
(Stored with Git LFS)
BIN
Content/Levels/PrototypeLevelRework.umap
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/PrototypeLevelRework1.umap
(Stored with Git LFS)
BIN
Content/Levels/PrototypeLevelRework1.umap
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Box_18AF9D00.uasset
(Stored with Git LFS)
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Box_18AF9D00.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_4CA95822.uasset
(Stored with Git LFS)
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_4CA95822.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_881E35A2.uasset
(Stored with Git LFS)
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_881E35A2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_B1DF9375.uasset
(Stored with Git LFS)
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Extrude_B1DF9375.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Path_934A14D3.uasset
(Stored with Git LFS)
BIN
Content/Levels/_GENERATED/ThomasWhitelegg/Path_934A14D3.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Monolith/BPI_Bullet.uasset
(Stored with Git LFS)
BIN
Content/Monolith/BPI_Bullet.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Monolith/BPI_Monolith.uasset
(Stored with Git LFS)
BIN
Content/Monolith/BPI_Monolith.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Monolith/UI/WBP_Died.uasset
(Stored with Git LFS)
BIN
Content/Monolith/UI/WBP_Died.uasset
(Stored with Git LFS)
Binary file not shown.
@ -46,7 +46,6 @@ void AMonolithCharacter::BeginPlay()
|
||||
// Call the base class
|
||||
Super::BeginPlay();
|
||||
|
||||
MaxHealth = Health;
|
||||
Mesh1P = Cast<USkeletalMeshComponent>(GetComponentByClass(USkeletalMeshComponent::StaticClass()));
|
||||
CharMove = Cast<UCharacterMovementComponent>(GetComponentByClass(UCharacterMovementComponent::StaticClass()));
|
||||
if (CharMove) WalkSpeed = CharMove->MaxWalkSpeed;
|
||||
@ -123,19 +122,6 @@ static void UpdateMoveState(FMoveState& MoveState, int Forwards, int Sideways)
|
||||
}
|
||||
}
|
||||
|
||||
void AMonolithCharacter::IncrementHealth(float amount)
|
||||
{
|
||||
Health += amount;
|
||||
if (Health > MaxHealth)
|
||||
{
|
||||
Health = MaxHealth;
|
||||
}
|
||||
else if (Health <= 0)
|
||||
{
|
||||
Died();
|
||||
}
|
||||
}
|
||||
|
||||
void AMonolithCharacter::Move(const FInputActionValue& Value)
|
||||
{
|
||||
// input is a Vector2D
|
||||
|
@ -58,11 +58,6 @@ class AMonolithCharacter : public ACharacter
|
||||
// Amount of impulse to add when dashing
|
||||
UPROPERTY(EditAnywhere, Category = "MoveState", meta=(AllowPrivateAccess = "true"))
|
||||
float DashImpulse = 600.f;
|
||||
|
||||
UPROPERTY(EditDefaultsOnly, Category = "Health", meta=(AllowPrivateAccess = "true"))
|
||||
float Health = 100.f;
|
||||
|
||||
float MaxHealth;
|
||||
|
||||
USkeletalMeshComponent* Mesh1P;
|
||||
UCharacterMovementComponent* CharMove;
|
||||
@ -75,25 +70,6 @@ protected:
|
||||
void BeginPlay();
|
||||
void Tick(float DeltaSeconds) override;
|
||||
|
||||
UFUNCTION(BlueprintCallable)
|
||||
float GetHealth()
|
||||
{
|
||||
return Health;
|
||||
}
|
||||
|
||||
UFUNCTION(BlueprintCallable)
|
||||
void ResetHealth()
|
||||
{
|
||||
Health = MaxHealth;
|
||||
}
|
||||
|
||||
// Increase/Decrease health by this amount, will handle death
|
||||
UFUNCTION(BlueprintCallable)
|
||||
void IncrementHealth(float amount);
|
||||
|
||||
UFUNCTION(BlueprintImplementableEvent)
|
||||
void Died();
|
||||
|
||||
/** Called for movement input */
|
||||
void Move(const FInputActionValue& Value);
|
||||
void StopMove();
|
||||
|
Loading…
x
Reference in New Issue
Block a user