diff --git a/Master Assets/Character/Aura/Abilities/Cast_ArcaneShards.FBX b/Master Assets/Character/Aura/Abilities/Cast_ArcaneShards.FBX new file mode 100644 index 0000000..0874d11 --- /dev/null +++ b/Master Assets/Character/Aura/Abilities/Cast_ArcaneShards.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:963d89e6d4f6697a887590c978b7caf949aa8f25569f0e5d9e6d1b1129c4e7b9 +size 923808 diff --git a/Master Assets/Character/Aura/Abilities/Cast_ArcaneShards_Short.FBX b/Master Assets/Character/Aura/Abilities/Cast_ArcaneShards_Short.FBX new file mode 100644 index 0000000..4ef19b5 --- /dev/null +++ b/Master Assets/Character/Aura/Abilities/Cast_ArcaneShards_Short.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13bbf76ddcd4ebc65260927a52622a336f7b2adccc4011904df57d3809a9384b +size 857664 diff --git a/Master Assets/Character/Aura/Abilities/Cast_FireBolt.FBX b/Master Assets/Character/Aura/Abilities/Cast_FireBolt.FBX new file mode 100644 index 0000000..2538974 --- /dev/null +++ b/Master Assets/Character/Aura/Abilities/Cast_FireBolt.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77fd7589176cc7cc65ff2440afd7c8349fff2c0e2676757b7decee6b40a47259 +size 1298960 diff --git a/Master Assets/Character/Aura/Abilities/Cast_Shock.FBX b/Master Assets/Character/Aura/Abilities/Cast_Shock.FBX new file mode 100644 index 0000000..08b6029 --- /dev/null +++ b/Master Assets/Character/Aura/Abilities/Cast_Shock.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af48219a2a866a7d0dad25708651743e3fdf65c55c3d804f91fa65dec277ef5a +size 791504 diff --git a/Master Assets/Character/Aura/Abilities/Cast_Shock_Loop.FBX b/Master Assets/Character/Aura/Abilities/Cast_Shock_Loop.FBX new file mode 100644 index 0000000..1476d6d --- /dev/null +++ b/Master Assets/Character/Aura/Abilities/Cast_Shock_Loop.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f71097fbdae45dab92008335a9110b2cc1d30290a6b3270b73f6757e0612976 +size 1309808 diff --git a/Master Assets/Character/Aura/Idle.FBX b/Master Assets/Character/Aura/Idle.FBX new file mode 100644 index 0000000..9792c13 --- /dev/null +++ b/Master Assets/Character/Aura/Idle.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:111eec05acd31420bfa4619456d98a512c6f3526fa0632b389bd1f7f1702f408 +size 3233024 diff --git a/Master Assets/Character/Aura/Run.FBX b/Master Assets/Character/Aura/Run.FBX new file mode 100644 index 0000000..bb8ca58 --- /dev/null +++ b/Master Assets/Character/Aura/Run.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d4761820a6b51196133b74784a9d3c40b6d9381e63daa92e14303381e3da91b +size 846528 diff --git a/Master Assets/Character/Aura/Walk.FBX b/Master Assets/Character/Aura/Walk.FBX new file mode 100644 index 0000000..5bbd1fb --- /dev/null +++ b/Master Assets/Character/Aura/Walk.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e84e485beff069d63de3640dfbed46775b5b7b7ffe79d8f12c8f950e954ee499 +size 989904 diff --git a/Project/Binaries/Win64/UnrealEditor-Gasa.dll b/Project/Binaries/Win64/UnrealEditor-Gasa.dll index dcc7c5d..0bf8c64 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 e2abad9..71a2258 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-Gasa.pdb and b/Project/Binaries/Win64/UnrealEditor-Gasa.pdb differ diff --git a/Project/Binaries/Win64/UnrealEditor-GasaEditor.dll b/Project/Binaries/Win64/UnrealEditor-GasaEditor.dll index a9a03aa..66c2159 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-GasaEditor.dll and b/Project/Binaries/Win64/UnrealEditor-GasaEditor.dll differ diff --git a/Project/Binaries/Win64/UnrealEditor-GasaEditor.pdb b/Project/Binaries/Win64/UnrealEditor-GasaEditor.pdb index 211edbd..d463302 100644 Binary files a/Project/Binaries/Win64/UnrealEditor-GasaEditor.pdb and b/Project/Binaries/Win64/UnrealEditor-GasaEditor.pdb differ diff --git a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_ArcaneShards.uasset b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_ArcaneShards.uasset index 83f443e..882dc94 100644 --- a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_ArcaneShards.uasset +++ b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_ArcaneShards.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0135fa2bb4fccabb6b0d38f649bc4af3556eba82c63f7759cc30f00ddc7fb21 -size 238583 +oid sha256:063dd40f36435db8b6f9584df3bb346e3fd5d7bd365a95f8a33f624e88d738ad +size 154777 diff --git a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_ArcaneShards_Short.uasset b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_ArcaneShards_Short.uasset index f8096bd..6ee01e4 100644 --- a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_ArcaneShards_Short.uasset +++ b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_ArcaneShards_Short.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2955e4af7352eb0f586570ead0b7b8a42dd8ff8b27198bede81781ccd8df5590 -size 178524 +oid sha256:b0ef3bcbdff1bd59ef6e4a7b9f4e56d58ba430824ddb015c5cf18efd04f9ef64 +size 125188 diff --git a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_FireBolt.uasset b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_FireBolt.uasset index 86ead7b..290731d 100644 --- a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_FireBolt.uasset +++ b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_FireBolt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:813235f934dfd2f55c2435d35214408997368774d547a0eb72426be957ab273e -size 192835 +oid sha256:814e3065735a0fdfd59190544994705ab7dcab6788a2d14511c3a5bb44f5745c +size 105144 diff --git a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_Shock.uasset b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_Shock.uasset index 0e639d0..a1fede4 100644 --- a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_Shock.uasset +++ b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_Shock.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:025df98cba5e1f9c1ddcfa538a6ee1270eabc292d1c77bb24866786b8696374c -size 124788 +oid sha256:63929e5aebfe3f59cd22dde1a003d4bd29c3c95157e5ef29b0bba0aef31252dc +size 55723 diff --git a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_Shock_Loop.uasset b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_Shock_Loop.uasset index 63c5fb9..7935c4c 100644 --- a/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_Shock_Loop.uasset +++ b/Project/Content/Assets/Characters/Aura/Animations/Abilities/Cast_Shock_Loop.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dceafccc59414af4daa10d849c29c46f04aa4f682a7ad45fb571eb3975340371 -size 330225 +oid sha256:59da77d40255e8ea36c992b8e24f03db6adfd93c6f12449d3bed216f7ede7051 +size 328236 diff --git a/Project/Content/Assets/Characters/Aura/Animations/Idle.uasset b/Project/Content/Assets/Characters/Aura/Animations/Idle.uasset index bf20837..da0208c 100644 --- a/Project/Content/Assets/Characters/Aura/Animations/Idle.uasset +++ b/Project/Content/Assets/Characters/Aura/Animations/Idle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2cdd5e97e19cf0e43ae04bde41ee706758c5c65e41fc6971d8eab155ab369f1 -size 767528 +oid sha256:6cefe4716c3736a0a4d356f990ed698413d5760fb71670e362b9fcb97badfc8e +size 626059 diff --git a/Project/Content/Assets/Characters/Aura/Animations/Run.uasset b/Project/Content/Assets/Characters/Aura/Animations/Run.uasset index 1e0ee8e..5db4357 100644 --- a/Project/Content/Assets/Characters/Aura/Animations/Run.uasset +++ b/Project/Content/Assets/Characters/Aura/Animations/Run.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3af112bbfdc94755c3d0942f57d767ffac77064a65973df451d24ff95358849f -size 236888 +oid sha256:8424fde1503099facd6887b9554814ad949b9038e61142993a0e56bc41f714dd +size 120055 diff --git a/Project/Content/Assets/Characters/Aura/Animations/Walk.uasset b/Project/Content/Assets/Characters/Aura/Animations/Walk.uasset index a66143c..94f17d5 100644 --- a/Project/Content/Assets/Characters/Aura/Animations/Walk.uasset +++ b/Project/Content/Assets/Characters/Aura/Animations/Walk.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a740baddca592dc9763238379ce54fafd072d12f43e78c1a0eb5cee0dc25a8d -size 308059 +oid sha256:18b2ad8c6565cb72575ff64ef27c655598892431d2f0794071943c38abf851d6 +size 184635 diff --git a/Project/Content/Assets/Characters/Aura/SKM_Aura.uasset b/Project/Content/Assets/Characters/Aura/SKM_Aura.uasset index 9c384ad..ac2375e 100644 --- a/Project/Content/Assets/Characters/Aura/SKM_Aura.uasset +++ b/Project/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:33721e525b5be02fa37b875f625d0b835ee17ebef2bdaa9f510133f54adf1f32 +size 4415778 diff --git a/Project/Content/Assets/Characters/Aura/SK_Aura.uasset b/Project/Content/Assets/Characters/Aura/SK_Aura.uasset index 2e9dcf1..b2e34da 100644 --- a/Project/Content/Assets/Characters/Aura/SK_Aura.uasset +++ b/Project/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:4d2e3818a5e5ee020f651c12d845efed66621bb8f5794fce127985b14d9e4831 +size 35433 diff --git a/Project/Content/Assets/Dungeon/Checkpoint/Checkpoint_low.uasset b/Project/Content/Assets/Dungeon/Checkpoint/Checkpoint_low.uasset deleted file mode 100644 index 275d634..0000000 --- a/Project/Content/Assets/Dungeon/Checkpoint/Checkpoint_low.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa302d88d55ddb98846e0ade74d13e81612b80024fe23dfc2d0eb8252348f372 -size 1564 diff --git a/Project/Content/Assets/Enemies/Goblin/SKM_Goblin.uasset b/Project/Content/Assets/Enemies/Goblin/SKM_Goblin.uasset index 5734ff8..85ec434 100644 --- a/Project/Content/Assets/Enemies/Goblin/SKM_Goblin.uasset +++ b/Project/Content/Assets/Enemies/Goblin/SKM_Goblin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3d5e842ecf6ee10b728fd0d9e4264e7e39fd265e6cb2ef7f715c71807a71b81 -size 841221 +oid sha256:57e5c2e6921249eef3b053312be8ff86f5c230e415ab620c5ec5dbd2d09feec9 +size 796052 diff --git a/Project/Content/Core/Actors/BP_GoblinSpear.uasset b/Project/Content/Core/Actors/BP_GoblinSpear.uasset new file mode 100644 index 0000000..5de4c72 --- /dev/null +++ b/Project/Content/Core/Actors/BP_GoblinSpear.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad5b83b966464fc36962a492693b4a893386e2dff93a374532bc504dacd20978 +size 33956 diff --git a/Project/Content/Core/Actors/BP_PlayerCharacter.uasset b/Project/Content/Core/Actors/BP_PlayerCharacter.uasset new file mode 100644 index 0000000..105f1b2 --- /dev/null +++ b/Project/Content/Core/Actors/BP_PlayerCharacter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a644ed405b56c888708418df0a83839462cd4b69d15b09e3583b63e960fea7b +size 24098 diff --git a/Project/GASATHON.uproject b/Project/Gasa.uproject similarity index 92% rename from Project/GASATHON.uproject rename to Project/Gasa.uproject index 86159ef..71abfc1 100644 --- a/Project/GASATHON.uproject +++ b/Project/Gasa.uproject @@ -2,8 +2,20 @@ "FileVersion": 3, "EngineAssociation": "{B4C3B326-47D3-EED1-8259-8885D212EA60}", "Category": "", - "Description": "GASATHON", + "Description": "Gasa", "DisableEnginePluginsByDefault": true, + "Modules": [ + { + "Name": "Gasa", + "Type": "Runtime", + "LoadingPhase": "Default" + }, + { + "Name": "GasaEditor", + "Type": "Editor", + "LoadingPhase": "Default" + } + ], "Plugins": [ { "Name": "ModelingToolsEditorMode", @@ -211,16 +223,6 @@ "Android" ] }, - { - "Name": "OpenXRHandTracking", - "Enabled": true, - "SupportedTargetPlatforms": [ - "Win64", - "Linux", - "Android", - "VisionOS" - ] - }, { "Name": "OpenXRMsftHandInteraction", "Enabled": true, @@ -280,6 +282,24 @@ { "Name": "GameplayAbilities", "Enabled": true + }, + { + "Name": "LiveLink", + "Enabled": true + }, + { + "Name": "OpenXRHandTracking", + "Enabled": true, + "SupportedTargetPlatforms": [ + "Win64", + "Linux", + "Android", + "VisionOS" + ] + }, + { + "Name": "VisualStudioSourceCodeAccess", + "Enabled": true } ] -} +} \ No newline at end of file diff --git a/Project/Source/Gasa/Character/EnemyCharacter.cpp b/Project/Source/Gasa/Character/EnemyCharacter.cpp new file mode 100644 index 0000000..9669d0c --- /dev/null +++ b/Project/Source/Gasa/Character/EnemyCharacter.cpp @@ -0,0 +1 @@ +#include "EnemyCharacter.h" \ No newline at end of file diff --git a/Project/Source/Gasa/Character/EnemyCharacter.h b/Project/Source/Gasa/Character/EnemyCharacter.h new file mode 100644 index 0000000..7bf1e33 --- /dev/null +++ b/Project/Source/Gasa/Character/EnemyCharacter.h @@ -0,0 +1,13 @@ +#pragma once + +#include "GasaCharacter.h" + +#include "EnemyCharacter.generated.h" + +UCLASS(Blueprintable) +class GASA_API AEnemyCharacter : public AGasaCharacter +{ + GENERATED_BODY() +public: + +}; diff --git a/Project/Source/Gasa/Character/GasaCharacter.cpp b/Project/Source/Gasa/Character/GasaCharacter.cpp new file mode 100644 index 0000000..81ecec4 --- /dev/null +++ b/Project/Source/Gasa/Character/GasaCharacter.cpp @@ -0,0 +1,15 @@ +#include "GasaCharacter.h" + +AGasaCharacter::AGasaCharacter() +{ + PrimaryActorTick.bCanEverTick = false; + + Weapon = CreateDefaultSubobject("Weapon"); + Weapon->SetupAttachment(GetMesh(), FName("WeaponAttach")); + Weapon->SetCollisionEnabled(ECollisionEnabled::NoCollision); +} + +void AGasaCharacter::BeginPlay() +{ + Super::BeginPlay(); +} diff --git a/Project/Source/Gasa/Character/GasaCharacter.h b/Project/Source/Gasa/Character/GasaCharacter.h new file mode 100644 index 0000000..8b1e5d4 --- /dev/null +++ b/Project/Source/Gasa/Character/GasaCharacter.h @@ -0,0 +1,22 @@ +#pragma once + +#include "GameFramework/Character.h" + +#include "GasaCharacter.generated.h" + +UCLASS(Abstract) +class GASA_API AGasaCharacter : public ACharacter +{ + GENERATED_BODY() +public: + AGasaCharacter(); + +#pragma region Combat + UPROPERTY(EditAnywhere, Category="Combat") + TObjectPtr Weapon; +#pragma endregion Combat + +#pragma region Actor + void BeginPlay() override; +#pragma endregion Actor +}; diff --git a/Project/Source/Gasa/Character/PlayerCharacter.cpp b/Project/Source/Gasa/Character/PlayerCharacter.cpp new file mode 100644 index 0000000..89a2f20 --- /dev/null +++ b/Project/Source/Gasa/Character/PlayerCharacter.cpp @@ -0,0 +1 @@ +#include "PlayerCharacter.h" \ No newline at end of file diff --git a/Project/Source/Gasa/Character/PlayerCharacter.h b/Project/Source/Gasa/Character/PlayerCharacter.h new file mode 100644 index 0000000..3c9dcb0 --- /dev/null +++ b/Project/Source/Gasa/Character/PlayerCharacter.h @@ -0,0 +1,14 @@ +#pragma once + +#include "GasaCharacter.h" + +#include "PlayerCharacter.generated.h" + +UCLASS(Blueprintable) +class GASA_API APlayerCharacter : public AGasaCharacter +{ + GENERATED_BODY() +public: + + +}; diff --git a/Project/Source/Gasa/GasaCharacter.cpp b/Project/Source/Gasa/GasaCharacter.cpp deleted file mode 100644 index 5054719..0000000 --- a/Project/Source/Gasa/GasaCharacter.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "GasaCharacter.h" - -void AGasaCharacter::BeginPlay() -{ - Super::BeginPlay(); -} diff --git a/Project/Source/Gasa/GasaCharacter.h b/Project/Source/Gasa/GasaCharacter.h deleted file mode 100644 index 767603c..0000000 --- a/Project/Source/Gasa/GasaCharacter.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "GameFramework/Character.h" - -#include "GasaCharacter.generated.h" - -UCLASS(BlueprintType, Blueprintable) -class GASA_API AGasaCharacter : public ACharacter -{ - GENERATED_BODY() -public: - - #pragma region Actor - void BeginPlay() override; - #pragma endregion Actor -}; diff --git a/scripts/regen_project.ps1 b/scripts/regen_project.ps1 index c6a9472..e2c5bfe 100644 --- a/scripts/regen_project.ps1 +++ b/scripts/regen_project.ps1 @@ -6,7 +6,7 @@ $path_root = split-path -Parent -Path $path_scripts $path_ue = join-path '../../Surgo' 'UE' $path_project = join-path $path_root 'Project' -$uproject = join-path $path_project 'GASATHON.uproject' +$uproject = join-path $path_project 'Gasa.uproject' $UBT = join-path $path_ue 'Engine\Binaries\DotNET\UnrealBuildTool\UnrealBuildTool.exe'