diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 5eeb993..7fa02d2 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -71,3 +71,11 @@ ConnectionType=USBOnly bUseManualIPAddress=False ManualIPAddress= +[/Script/DLSS.DLSSSettings] +bEnableDLSSInEditorViewports=True +DLAAPreset=F +DLSSQualityPreset=D +DLSSBalancedPreset=D +DLSSPerformancePreset=D +DLSSUltraPerformancePreset=F + diff --git a/Content/Assets/Characters/Aura/SKM_Aura.uasset b/Content/Assets/Characters/Aura/SKM_Aura.uasset index 9c384ad..8294544 100644 --- a/Content/Assets/Characters/Aura/SKM_Aura.uasset +++ b/Content/Assets/Characters/Aura/SKM_Aura.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b155b4d2fc3815729345e4f907b21aae2b5f7bdc4809ce2b819d71be9a4d7af -size 4647323 +oid sha256:7bd7ea35ee8cdae575e8d1c8dded0884f85095bf1d8e447957a8be4c8ae44ad4 +size 11713753 diff --git a/Content/Assets/Characters/Aura/SK_Aura.uasset b/Content/Assets/Characters/Aura/SK_Aura.uasset index 2e9dcf1..6acc7e2 100644 --- a/Content/Assets/Characters/Aura/SK_Aura.uasset +++ b/Content/Assets/Characters/Aura/SK_Aura.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0074234430250c3f404035b15f102f09bd508153b078534c6ad82c9942cb2e58 -size 31529 +oid sha256:c0135008d005eb51eca9977f346d15242f192f36dcd780bbf71aa3e433e89f00 +size 32628 diff --git a/Content/Assets/Enemies/Goblin/SK_Goblin.uasset b/Content/Assets/Enemies/Goblin/SK_Goblin.uasset index 0cd0b39..51dd693 100644 --- a/Content/Assets/Enemies/Goblin/SK_Goblin.uasset +++ b/Content/Assets/Enemies/Goblin/SK_Goblin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43e3319742f386cf69df82a59d4f9a6f5d81e8d946dcb48e77ea9678671e3279 -size 15650 +oid sha256:e26d33054a4757f3c98bfce3ee525f41bf0dc4aa83d1b71ad096c6431465a468 +size 15634 diff --git a/Content/Blueprints/Character/Aura/BP_AuraCharacter.uasset b/Content/Blueprints/Character/Aura/BP_AuraCharacter.uasset new file mode 100644 index 0000000..b18fb5d --- /dev/null +++ b/Content/Blueprints/Character/Aura/BP_AuraCharacter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d8b5967e1421633043e649b3c5edf27123da68386e8a5dfa7c122d279922589 +size 32089 diff --git a/Content/Blueprints/Character/Enemy/GoblinSpear/BP_GoblinSpear.uasset b/Content/Blueprints/Character/Enemy/GoblinSpear/BP_GoblinSpear.uasset new file mode 100644 index 0000000..d641e61 --- /dev/null +++ b/Content/Blueprints/Character/Enemy/GoblinSpear/BP_GoblinSpear.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:445aa114892f8d468e3020f04d6fb44d9df81822648d09537e3509da36a389e2 +size 31896 diff --git a/Source/Aura/Private/AuraCharacterBase.cpp b/Source/Aura/Private/AuraCharacterBase.cpp deleted file mode 100644 index f5faf2e..0000000 --- a/Source/Aura/Private/AuraCharacterBase.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// Assets provided by DruidMechanics. Copyright Jonathan Rampersad 2024 - - -#include "AuraCharacterBase.h" - -// Sets default values -AAuraCharacterBase::AAuraCharacterBase() -{ - // Set this character to call Tick() every frame. You can turn this off to improve performance if you don't need it. - PrimaryActorTick.bCanEverTick = true; - -} - -// Called when the game starts or when spawned -void AAuraCharacterBase::BeginPlay() -{ - Super::BeginPlay(); - -} - -// Called every frame -void AAuraCharacterBase::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); - -} - -// Called to bind functionality to input -void AAuraCharacterBase::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) -{ - Super::SetupPlayerInputComponent(PlayerInputComponent); - -} - diff --git a/Source/Aura/Private/Character/AuraCharacter.cpp b/Source/Aura/Private/Character/AuraCharacter.cpp new file mode 100644 index 0000000..65e6160 --- /dev/null +++ b/Source/Aura/Private/Character/AuraCharacter.cpp @@ -0,0 +1,5 @@ +// Assets provided by DruidMechanics. Copyright Jonathan Rampersad 2024 + + +#include "Character/AuraCharacter.h" + diff --git a/Source/Aura/Private/Character/AuraCharacterBase.cpp b/Source/Aura/Private/Character/AuraCharacterBase.cpp new file mode 100644 index 0000000..3423ec5 --- /dev/null +++ b/Source/Aura/Private/Character/AuraCharacterBase.cpp @@ -0,0 +1,22 @@ +// Assets provided by DruidMechanics. Copyright Jonathan Rampersad 2024 + + +#include "Character/AuraCharacterBase.h" + +// Sets default values +AAuraCharacterBase::AAuraCharacterBase() +{ + PrimaryActorTick.bCanEverTick = false; + + Weapon = CreateDefaultSubobject(TEXT("Weapon")); + Weapon->SetupAttachment(GetMesh(), FName("WeaponHandSocket")); + Weapon->SetCollisionEnabled(ECollisionEnabled::NoCollision); + +} + +// Called when the game starts or when spawned +void AAuraCharacterBase::BeginPlay() +{ + Super::BeginPlay(); + +} diff --git a/Source/Aura/Private/Character/AuraEnemy.cpp b/Source/Aura/Private/Character/AuraEnemy.cpp new file mode 100644 index 0000000..d2cda85 --- /dev/null +++ b/Source/Aura/Private/Character/AuraEnemy.cpp @@ -0,0 +1,5 @@ +// Assets provided by DruidMechanics. Copyright Jonathan Rampersad 2024 + + +#include "Character/AuraEnemy.h" + diff --git a/Source/Aura/Public/Character/AuraCharacter.h b/Source/Aura/Public/Character/AuraCharacter.h new file mode 100644 index 0000000..20d1256 --- /dev/null +++ b/Source/Aura/Public/Character/AuraCharacter.h @@ -0,0 +1,17 @@ +// Assets provided by DruidMechanics. Copyright Jonathan Rampersad 2024 + +#pragma once + +#include "CoreMinimal.h" +#include "AuraCharacterBase.h" +#include "AuraCharacter.generated.h" + +/** + * + */ +UCLASS() +class AURA_API AAuraCharacter : public AAuraCharacterBase +{ + GENERATED_BODY() + +}; diff --git a/Source/Aura/Public/AuraCharacterBase.h b/Source/Aura/Public/Character/AuraCharacterBase.h similarity index 66% rename from Source/Aura/Public/AuraCharacterBase.h rename to Source/Aura/Public/Character/AuraCharacterBase.h index d9f8fed..2b04e13 100644 --- a/Source/Aura/Public/AuraCharacterBase.h +++ b/Source/Aura/Public/Character/AuraCharacterBase.h @@ -6,7 +6,7 @@ #include "GameFramework/Character.h" #include "AuraCharacterBase.generated.h" -UCLASS() +UCLASS(Abstract) class AURA_API AAuraCharacterBase : public ACharacter { GENERATED_BODY() @@ -19,11 +19,7 @@ protected: // Called when the game starts or when spawned virtual void BeginPlay() override; -public: - // Called every frame - virtual void Tick(float DeltaTime) override; - - // Called to bind functionality to input - virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + UPROPERTY(EditAnywhere, Category="Combat") + TObjectPtr Weapon; }; diff --git a/Source/Aura/Public/Character/AuraEnemy.h b/Source/Aura/Public/Character/AuraEnemy.h new file mode 100644 index 0000000..5dacaa9 --- /dev/null +++ b/Source/Aura/Public/Character/AuraEnemy.h @@ -0,0 +1,17 @@ +// Assets provided by DruidMechanics. Copyright Jonathan Rampersad 2024 + +#pragma once + +#include "CoreMinimal.h" +#include "AuraCharacterBase.h" +#include "AuraEnemy.generated.h" + +/** + * + */ +UCLASS() +class AURA_API AAuraEnemy : public AAuraCharacterBase +{ + GENERATED_BODY() + +};