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/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'