13. #2
This commit is contained in:
		
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -47,6 +47,7 @@ r.DynamicGlobalIlluminationMethod=1
 | 
				
			|||||||
r.ReflectionMethod=1
 | 
					r.ReflectionMethod=1
 | 
				
			||||||
r.Shadow.Virtual.Enable=1
 | 
					r.Shadow.Virtual.Enable=1
 | 
				
			||||||
r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
 | 
					r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
 | 
				
			||||||
 | 
					r.CustomDepth=3
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
 | 
					[/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
 | 
				
			||||||
CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'
 | 
					CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								Project/Content/Actors/Enemies/Goblin/Materials/M_Goblin.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Project/Content/Actors/Enemies/Goblin/Materials/M_Goblin.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Project/Content/Core/Actors/BP_Enemy.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Project/Content/Core/Actors/BP_Enemy.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Project/Content/Core/Actors/BP_GoblinSlingshot.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Project/Content/Core/Actors/BP_GoblinSlingshot.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Project/Content/Core/Actors/BP_GoblinSpear.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Project/Content/Core/Actors/BP_GoblinSpear.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Project/Content/Levels/StartupMap.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Project/Content/Levels/StartupMap.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Project/Content/MaterialLibrary/MI_Highlight.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Project/Content/MaterialLibrary/MI_Highlight.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Project/Content/MaterialLibrary/PP_Highlight.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Project/Content/MaterialLibrary/PP_Highlight.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -1 +1,6 @@
 | 
				
			|||||||
#include "EnemyCharacter.h"
 | 
					#include "EnemyCharacter.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					AEnemyCharacter::AEnemyCharacter()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						PrimaryActorTick.bCanEverTick = true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,5 +9,5 @@ class GASA_API AEnemyCharacter : public AGasaCharacter
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	GENERATED_BODY()
 | 
						GENERATED_BODY()
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
	
 | 
						AEnemyCharacter();
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,6 +15,8 @@ AGasaCharacter::AGasaCharacter()
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	PrimaryActorTick.bCanEverTick = false;
 | 
						PrimaryActorTick.bCanEverTick = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						HighlightColor = FLinearColor(0.8, 0.32, 0.05f, 1.f);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	UCharacterMovementComponent*
 | 
						UCharacterMovementComponent*
 | 
				
			||||||
	Movement = GetCharacterMovement();
 | 
						Movement = GetCharacterMovement();
 | 
				
			||||||
	Movement->bOrientRotationToMovement = true;
 | 
						Movement->bOrientRotationToMovement = true;
 | 
				
			||||||
@@ -68,7 +70,7 @@ void AGasaCharacter::Tick(float DeltaSeconds)
 | 
				
			|||||||
				, Capsule->GetScaledCapsuleHalfHeight()
 | 
									, Capsule->GetScaledCapsuleHalfHeight()
 | 
				
			||||||
				, Capsule->GetScaledCapsuleRadius()
 | 
									, Capsule->GetScaledCapsuleRadius()
 | 
				
			||||||
				, Capsule->GetComponentRotation()
 | 
									, Capsule->GetComponentRotation()
 | 
				
			||||||
				, FLinearColor(0.8, 0.32, 0.05f, 1.f)
 | 
									, HighlightColor
 | 
				
			||||||
				, 0.f
 | 
									, 0.f
 | 
				
			||||||
				, 1.f
 | 
									, 1.f
 | 
				
			||||||
			);
 | 
								);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,6 +17,8 @@ class GASA_API AGasaCharacter : public ACharacter
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
	GENERATED_BODY()
 | 
						GENERATED_BODY()
 | 
				
			||||||
public:
 | 
					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
 | 
					#pragma region Camera
 | 
				
			||||||
	UPROPERTY(EditAnywhere, Category="Camera")
 | 
						UPROPERTY(EditAnywhere, Category="Camera")
 | 
				
			||||||
	UCameraComponent* Camera;
 | 
						UCameraComponent* Camera;
 | 
				
			||||||
@@ -32,13 +34,19 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	// This will be implemented in the base until it needs to be lifted into an abstraction.
 | 
						// This will be implemented in the base until it needs to be lifted into an abstraction.
 | 
				
			||||||
#pragma region Highlighting
 | 
					#pragma region Highlighting
 | 
				
			||||||
 | 
						UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Highlighting")
 | 
				
			||||||
	EHighlight HighlightState;
 | 
						EHighlight HighlightState;
 | 
				
			||||||
 | 
						
 | 
				
			||||||
 | 
						UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Highlighting")
 | 
				
			||||||
 | 
						FLinearColor HighlightColor;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						UFUNCTION(BlueprintCallable, Category="Highlighting")
 | 
				
			||||||
	void SetHighlight( EHighlight Desired );
 | 
						void SetHighlight( EHighlight Desired );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	UFUNCTION(BlueprintCallable)
 | 
						UFUNCTION(BlueprintCallable, Category="Highlighting")
 | 
				
			||||||
	FORCEINLINE void Highlight() { SetHighlight(EHighlight::Enabled); };
 | 
						FORCEINLINE void Highlight() { SetHighlight(EHighlight::Enabled); };
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	UFUNCTION(BlueprintCallable)
 | 
						UFUNCTION(BlueprintCallable, Category="Highlighting")
 | 
				
			||||||
	FORCEINLINE void Dehighlight() { SetHighlight(EHighlight::Disabled); };
 | 
						FORCEINLINE void Dehighlight() { SetHighlight(EHighlight::Disabled); };
 | 
				
			||||||
#pragma endregion Highlighting
 | 
					#pragma endregion Highlighting
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,10 +13,10 @@ public:
 | 
				
			|||||||
#pragma region Cog
 | 
					#pragma region Cog
 | 
				
			||||||
    // To make sure it doesn't get garbage collected.
 | 
					    // To make sure it doesn't get garbage collected.
 | 
				
			||||||
    UPROPERTY()
 | 
					    UPROPERTY()
 | 
				
			||||||
    TObjectPtr<UObject> CogWindowManagerRef = nullptr;
 | 
					    TObjectPtr<UObject> CogWindowManagerRef;
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
#if ENABLE_COG
 | 
					#if ENABLE_COG
 | 
				
			||||||
	TObjectPtr<UCogWindowManager> CogWindowManager = nullptr;
 | 
						TObjectPtr<UCogWindowManager> CogWindowManager;
 | 
				
			||||||
#endif // ENABLE_COG
 | 
					#endif // ENABLE_COG
 | 
				
			||||||
#pragma endregion Cog
 | 
					#pragma endregion Cog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user