diff --git a/Project/Binaries/Win64/UnrealEditor-Gasa.dll b/Project/Binaries/Win64/UnrealEditor-Gasa.dll index ad02e51..7ad2072 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-Gasa.dll and b/Project/Binaries/Win64/UnrealEditor-Gasa.dll differ diff --git a/Project/Binaries/Win64/UnrealEditor-Gasa.pdb b/Project/Binaries/Win64/UnrealEditor-Gasa.pdb index 69dec06..a127970 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-Gasa.pdb and b/Project/Binaries/Win64/UnrealEditor-Gasa.pdb differ diff --git a/Project/Config/DefaultEngine.ini b/Project/Config/DefaultEngine.ini index 0feed8b..fb93593 100644 --- a/Project/Config/DefaultEngine.ini +++ b/Project/Config/DefaultEngine.ini @@ -47,6 +47,7 @@ r.DynamicGlobalIlluminationMethod=1 r.ReflectionMethod=1 r.Shadow.Virtual.Enable=1 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True +r.CustomDepth=3 [/Script/WorldPartitionEditor.WorldPartitionEditorSettings] CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' diff --git a/Project/Content/Actors/Enemies/Goblin/Materials/M_Goblin.uasset b/Project/Content/Actors/Enemies/Goblin/Materials/M_Goblin.uasset index c2083f7..cee7f1b 100644 --- a/Project/Content/Actors/Enemies/Goblin/Materials/M_Goblin.uasset +++ b/Project/Content/Actors/Enemies/Goblin/Materials/M_Goblin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5a6c6446f4bfce3da6695234bcce85d3f295eadc978a8602402fa0b82e386b0 -size 14812 +oid sha256:01266f3b23ddd9416ae6305923a3f9dabbc1cd7182d6e864e46bd8cb6ff3a535 +size 17996 diff --git a/Project/Content/Core/Actors/BP_Enemy.uasset b/Project/Content/Core/Actors/BP_Enemy.uasset new file mode 100644 index 0000000..3f19c6b --- /dev/null +++ b/Project/Content/Core/Actors/BP_Enemy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a85ba7315296d5ad5ecc2afe31054e0bec90070f6d45989ff7a019b230a8dfbd +size 25249 diff --git a/Project/Content/Core/Actors/BP_GoblinSlingshot.uasset b/Project/Content/Core/Actors/BP_GoblinSlingshot.uasset index a0bb4f2..f40a7ef 100644 --- a/Project/Content/Core/Actors/BP_GoblinSlingshot.uasset +++ b/Project/Content/Core/Actors/BP_GoblinSlingshot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b109586d2953e3a14451c3608fc09a56eab4b4a80a54cae5aca8c9d3d5cebb07 -size 33884 +oid sha256:33d8a01eea3f5d55f2e3bc0d3fd3764adfc54304707cfcf9b8e5e0f3dd5adeaf +size 35172 diff --git a/Project/Content/Core/Actors/BP_GoblinSpear.uasset b/Project/Content/Core/Actors/BP_GoblinSpear.uasset index 72e6de4..e1064d7 100644 --- a/Project/Content/Core/Actors/BP_GoblinSpear.uasset +++ b/Project/Content/Core/Actors/BP_GoblinSpear.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17bcdf1e2bae895aff248d45d7079a583741cc9c6421bc518785860409757c57 -size 33899 +oid sha256:b797668ab20c353e50764bc7ec9d756bf3d82013a34a7a200b91ab5ccb7f6b84 +size 34936 diff --git a/Project/Content/Levels/StartupMap.umap b/Project/Content/Levels/StartupMap.umap index ef4f549..a9d4c24 100644 --- a/Project/Content/Levels/StartupMap.umap +++ b/Project/Content/Levels/StartupMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ec89d7ce1fc847ade7513953f2ae93e897711775e0e7e7d64ad98c8c1513e18 -size 40039 +oid sha256:24cf69d41f4b72383b01ebb83be0ac6d59b446109841095029bac15363644b33 +size 54298 diff --git a/Project/Content/MaterialLibrary/MI_Highlight.uasset b/Project/Content/MaterialLibrary/MI_Highlight.uasset new file mode 100644 index 0000000..c0c504d --- /dev/null +++ b/Project/Content/MaterialLibrary/MI_Highlight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d47b7c39673a590804ca7d0d795896391c4792129bfa9f403dc78a938f140a2d +size 6470 diff --git a/Project/Content/MaterialLibrary/PP_Highlight.uasset b/Project/Content/MaterialLibrary/PP_Highlight.uasset index 3936ce2..8107176 100644 --- a/Project/Content/MaterialLibrary/PP_Highlight.uasset +++ b/Project/Content/MaterialLibrary/PP_Highlight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff0addf0cfdcc98cb0ece1be5a2e08be66640d43381391732741b558c1a51be9 -size 59527 +oid sha256:0a501c1d57f99b3b270ecc7477d0de87b18eb53f313181815cd599400fd626e5 +size 59519 diff --git a/Project/Source/Gasa/Character/EnemyCharacter.cpp b/Project/Source/Gasa/Character/EnemyCharacter.cpp index 9669d0c..b07f232 100644 --- a/Project/Source/Gasa/Character/EnemyCharacter.cpp +++ b/Project/Source/Gasa/Character/EnemyCharacter.cpp @@ -1 +1,6 @@ -#include "EnemyCharacter.h" \ No newline at end of file +#include "EnemyCharacter.h" + +AEnemyCharacter::AEnemyCharacter() +{ + PrimaryActorTick.bCanEverTick = true; +} diff --git a/Project/Source/Gasa/Character/EnemyCharacter.h b/Project/Source/Gasa/Character/EnemyCharacter.h index 7bf1e33..ee449f8 100644 --- a/Project/Source/Gasa/Character/EnemyCharacter.h +++ b/Project/Source/Gasa/Character/EnemyCharacter.h @@ -9,5 +9,5 @@ class GASA_API AEnemyCharacter : public AGasaCharacter { GENERATED_BODY() public: - + AEnemyCharacter(); }; diff --git a/Project/Source/Gasa/Character/GasaCharacter.cpp b/Project/Source/Gasa/Character/GasaCharacter.cpp index 12d2f35..f1edd86 100644 --- a/Project/Source/Gasa/Character/GasaCharacter.cpp +++ b/Project/Source/Gasa/Character/GasaCharacter.cpp @@ -15,6 +15,8 @@ AGasaCharacter::AGasaCharacter() { PrimaryActorTick.bCanEverTick = false; + HighlightColor = FLinearColor(0.8, 0.32, 0.05f, 1.f); + UCharacterMovementComponent* Movement = GetCharacterMovement(); Movement->bOrientRotationToMovement = true; @@ -68,7 +70,7 @@ void AGasaCharacter::Tick(float DeltaSeconds) , Capsule->GetScaledCapsuleHalfHeight() , Capsule->GetScaledCapsuleRadius() , Capsule->GetComponentRotation() - , FLinearColor(0.8, 0.32, 0.05f, 1.f) + , HighlightColor , 0.f , 1.f ); diff --git a/Project/Source/Gasa/Character/GasaCharacter.h b/Project/Source/Gasa/Character/GasaCharacter.h index 5d89bf7..1ce5ca1 100644 --- a/Project/Source/Gasa/Character/GasaCharacter.h +++ b/Project/Source/Gasa/Character/GasaCharacter.h @@ -17,6 +17,8 @@ class GASA_API AGasaCharacter : public ACharacter { GENERATED_BODY() public: + // TODO(Ed): Either make a toggle ore move to player controller if it gets expensive + // There is no need to have this lodged int PlayerCharacter anyway. It can attach to pawn on posses. #pragma region Camera UPROPERTY(EditAnywhere, Category="Camera") UCameraComponent* Camera; @@ -32,13 +34,19 @@ public: // This will be implemented in the base until it needs to be lifted into an abstraction. #pragma region Highlighting + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Highlighting") EHighlight HighlightState; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Highlighting") + FLinearColor HighlightColor; + + UFUNCTION(BlueprintCallable, Category="Highlighting") void SetHighlight( EHighlight Desired ); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category="Highlighting") FORCEINLINE void Highlight() { SetHighlight(EHighlight::Enabled); }; - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category="Highlighting") FORCEINLINE void Dehighlight() { SetHighlight(EHighlight::Disabled); }; #pragma endregion Highlighting diff --git a/Project/Source/Gasa/GasaGameState.h b/Project/Source/Gasa/GasaGameState.h index 9ca5d73..2322878 100644 --- a/Project/Source/Gasa/GasaGameState.h +++ b/Project/Source/Gasa/GasaGameState.h @@ -13,10 +13,10 @@ public: #pragma region Cog // To make sure it doesn't get garbage collected. UPROPERTY() - TObjectPtr CogWindowManagerRef = nullptr; + TObjectPtr CogWindowManagerRef; #if ENABLE_COG - TObjectPtr CogWindowManager = nullptr; + TObjectPtr CogWindowManager; #endif // ENABLE_COG #pragma endregion Cog