From fbf0ea91c606eb61d087145d93a73bab39c175fb Mon Sep 17 00:00:00 2001 From: Allen Larsen Date: Tue, 2 Sep 2025 21:53:21 -0600 Subject: [PATCH 01/33] Bottles have been modelled haven't UV'd the bottles yet, will work on decor and corks next --- Raw Content/Models/decor bottles/SM_Bottle1.fbx | 3 +++ Raw Content/Models/decor bottles/SM_CubeBottle.fbx | 3 +++ Raw Content/Models/decor bottles/SM_DimondBottle.fbx | 3 +++ Raw Content/Models/decor bottles/SM_LongBottle.fbx | 3 +++ Raw Content/Models/decor bottles/SM_RectangleBottle.fbx | 3 +++ Raw Content/Models/decor bottles/SM_TallVialBottle.fbx | 3 +++ Raw Content/Models/decor bottles/SM_VialBottle.fbx | 3 +++ Raw Content/Models/decor bottles/SM_triangularBottle.fbx | 3 +++ Raw Content/Models/rocks/SM_Boulder.fbx | 3 +++ Raw Content/Models/rocks/SM_Pebble.fbx | 3 +++ Raw Content/Models/rocks/SM_Rock1.fbx | 3 +++ Raw Content/Models/rocks/SM_Rock2.fbx | 3 +++ 12 files changed, 36 insertions(+) create mode 100644 Raw Content/Models/decor bottles/SM_Bottle1.fbx create mode 100644 Raw Content/Models/decor bottles/SM_CubeBottle.fbx create mode 100644 Raw Content/Models/decor bottles/SM_DimondBottle.fbx create mode 100644 Raw Content/Models/decor bottles/SM_LongBottle.fbx create mode 100644 Raw Content/Models/decor bottles/SM_RectangleBottle.fbx create mode 100644 Raw Content/Models/decor bottles/SM_TallVialBottle.fbx create mode 100644 Raw Content/Models/decor bottles/SM_VialBottle.fbx create mode 100644 Raw Content/Models/decor bottles/SM_triangularBottle.fbx create mode 100644 Raw Content/Models/rocks/SM_Boulder.fbx create mode 100644 Raw Content/Models/rocks/SM_Pebble.fbx create mode 100644 Raw Content/Models/rocks/SM_Rock1.fbx create mode 100644 Raw Content/Models/rocks/SM_Rock2.fbx diff --git a/Raw Content/Models/decor bottles/SM_Bottle1.fbx b/Raw Content/Models/decor bottles/SM_Bottle1.fbx new file mode 100644 index 0000000..a787a1f --- /dev/null +++ b/Raw Content/Models/decor bottles/SM_Bottle1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb7403836cffa0696f3fddb39814aa833b8e3010c5d8958d226da3a3509f8a38 +size 35968 diff --git a/Raw Content/Models/decor bottles/SM_CubeBottle.fbx b/Raw Content/Models/decor bottles/SM_CubeBottle.fbx new file mode 100644 index 0000000..479f078 --- /dev/null +++ b/Raw Content/Models/decor bottles/SM_CubeBottle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab9e902b34a0f80bc13f495c9bea5bb42372d0cb737cc28b37ba56535868ccff +size 33728 diff --git a/Raw Content/Models/decor bottles/SM_DimondBottle.fbx b/Raw Content/Models/decor bottles/SM_DimondBottle.fbx new file mode 100644 index 0000000..108527b --- /dev/null +++ b/Raw Content/Models/decor bottles/SM_DimondBottle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3152f1c4175bb4843e5c0ec70b2ac0b4a32e8f12538ba62a44b3ddcf2cb37f5e +size 35712 diff --git a/Raw Content/Models/decor bottles/SM_LongBottle.fbx b/Raw Content/Models/decor bottles/SM_LongBottle.fbx new file mode 100644 index 0000000..369e33c --- /dev/null +++ b/Raw Content/Models/decor bottles/SM_LongBottle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36d86b7e692c75c33067c8346315a24a755dbfac613d1c143f0642e1f5e43848 +size 36096 diff --git a/Raw Content/Models/decor bottles/SM_RectangleBottle.fbx b/Raw Content/Models/decor bottles/SM_RectangleBottle.fbx new file mode 100644 index 0000000..819dc53 --- /dev/null +++ b/Raw Content/Models/decor bottles/SM_RectangleBottle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0089df70aa6bd9af06c9fd670fe99d9b79cc16b766fcc6b6086dfbc23a79bd4e +size 33472 diff --git a/Raw Content/Models/decor bottles/SM_TallVialBottle.fbx b/Raw Content/Models/decor bottles/SM_TallVialBottle.fbx new file mode 100644 index 0000000..9c3118f --- /dev/null +++ b/Raw Content/Models/decor bottles/SM_TallVialBottle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6304896f26e4441edb55c2004a1c47ca4038aa8057d78635bc2bed2e969f92e0 +size 34480 diff --git a/Raw Content/Models/decor bottles/SM_VialBottle.fbx b/Raw Content/Models/decor bottles/SM_VialBottle.fbx new file mode 100644 index 0000000..f8dd50c --- /dev/null +++ b/Raw Content/Models/decor bottles/SM_VialBottle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46a97ca4358a5feb75ffa2089d0e16f9693b9c4951fed41773758feb4a4feac7 +size 33472 diff --git a/Raw Content/Models/decor bottles/SM_triangularBottle.fbx b/Raw Content/Models/decor bottles/SM_triangularBottle.fbx new file mode 100644 index 0000000..d5aef97 --- /dev/null +++ b/Raw Content/Models/decor bottles/SM_triangularBottle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:925e22e8bfa438f3c7d149c2cc385c9149bd177e4f87cbed6f7e7647b6845971 +size 34480 diff --git a/Raw Content/Models/rocks/SM_Boulder.fbx b/Raw Content/Models/rocks/SM_Boulder.fbx new file mode 100644 index 0000000..64b6a28 --- /dev/null +++ b/Raw Content/Models/rocks/SM_Boulder.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:041e679d63f225a254428aefe13e0b1f036c0b3ea8c6b7360934be3ce865170e +size 36464 diff --git a/Raw Content/Models/rocks/SM_Pebble.fbx b/Raw Content/Models/rocks/SM_Pebble.fbx new file mode 100644 index 0000000..24b185c --- /dev/null +++ b/Raw Content/Models/rocks/SM_Pebble.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15ee9576f43dda24e1d6248cab3b3dc0147ee65118097035b3752efc707b8180 +size 36160 diff --git a/Raw Content/Models/rocks/SM_Rock1.fbx b/Raw Content/Models/rocks/SM_Rock1.fbx new file mode 100644 index 0000000..e40b9fd --- /dev/null +++ b/Raw Content/Models/rocks/SM_Rock1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:418f5c85212811627c3d2f613d37a5787aeb83fdaaf189c0f33a6073438cec8a +size 36128 diff --git a/Raw Content/Models/rocks/SM_Rock2.fbx b/Raw Content/Models/rocks/SM_Rock2.fbx new file mode 100644 index 0000000..de0fadf --- /dev/null +++ b/Raw Content/Models/rocks/SM_Rock2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d15e6969aa91696587febce3b61b1e606fa907f68c1142c9ae963fa7c32ff20 +size 36560 From 797fb379604363001f1ef86a5220e0efc309dcd0 Mon Sep 17 00:00:00 2001 From: G-ranium <156252946+G-ranium@users.noreply.github.com> Date: Tue, 9 Sep 2025 23:46:42 -0600 Subject: [PATCH 02/33] 2 market stalls the 3rd market stall was having issues and will be UV mapped and pushed tomorrow --- Raw Content/SM_Market_Stall_01.fbx | 3 +++ Raw Content/SM_Market_Stall_03.fbx | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 Raw Content/SM_Market_Stall_01.fbx create mode 100644 Raw Content/SM_Market_Stall_03.fbx diff --git a/Raw Content/SM_Market_Stall_01.fbx b/Raw Content/SM_Market_Stall_01.fbx new file mode 100644 index 0000000..1b38dc9 --- /dev/null +++ b/Raw Content/SM_Market_Stall_01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a545de125daf804afd0d712877de45d6325f33d20903c949d8d8e6d974fd069 +size 109776 diff --git a/Raw Content/SM_Market_Stall_03.fbx b/Raw Content/SM_Market_Stall_03.fbx new file mode 100644 index 0000000..3f3adf9 --- /dev/null +++ b/Raw Content/SM_Market_Stall_03.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9fc4581b2c28bd11291f3095270db78e1063294ec2b91cbec2e1ad61a0c89b3 +size 89952 From edaacf57310b3daea3d6956c6391fa3a1fd53af0 Mon Sep 17 00:00:00 2001 From: G-ranium <156252946+G-ranium@users.noreply.github.com> Date: Wed, 10 Sep 2025 18:13:58 -0600 Subject: [PATCH 03/33] Stall 2 fixed and UV mapped --- Raw Content/SM_Market_Stall_02.fbx | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Raw Content/SM_Market_Stall_02.fbx diff --git a/Raw Content/SM_Market_Stall_02.fbx b/Raw Content/SM_Market_Stall_02.fbx new file mode 100644 index 0000000..d512439 --- /dev/null +++ b/Raw Content/SM_Market_Stall_02.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3849ca3dad9aed23fa2746a18fdef5a747302b0bf6131079aa957e6be168495e +size 147552 From ddfc761c4c8a8178ccaad38e7740038a6c26bf84 Mon Sep 17 00:00:00 2001 From: Zach Rawlings Date: Sat, 13 Sep 2025 18:19:17 -0600 Subject: [PATCH 04/33] Alligator model and UV --- Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx | 3 +++ Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx create mode 100644 Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx diff --git a/Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx b/Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx new file mode 100644 index 0000000..2270d60 --- /dev/null +++ b/Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f782f88691a2102eb8883d06599e3eb456cd7f69d8fda58ef85b4ca0cf897bc6 +size 239552 diff --git a/Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx b/Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx new file mode 100644 index 0000000..6279514 --- /dev/null +++ b/Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:784a5faf7b01c82ae99ec1c75e63c41463da16489cc56b008dd49838c376136c +size 238896 From d04ccc3d6333f1f001dd09ba85c5921d406d05ae Mon Sep 17 00:00:00 2001 From: Nyx Date: Wed, 17 Sep 2025 19:41:28 -0600 Subject: [PATCH 05/33] added climbing anims --- Raw Content/Climbing Animations/ClimbDown.FBX | 3 +++ Raw Content/Climbing Animations/ClimbIdle.FBX | 3 +++ Raw Content/Climbing Animations/ClimbLeft.FBX | 3 +++ Raw Content/Climbing Animations/ClimbRight.FBX | 3 +++ Raw Content/Climbing Animations/ClimbUp.FBX | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 Raw Content/Climbing Animations/ClimbDown.FBX create mode 100644 Raw Content/Climbing Animations/ClimbIdle.FBX create mode 100644 Raw Content/Climbing Animations/ClimbLeft.FBX create mode 100644 Raw Content/Climbing Animations/ClimbRight.FBX create mode 100644 Raw Content/Climbing Animations/ClimbUp.FBX diff --git a/Raw Content/Climbing Animations/ClimbDown.FBX b/Raw Content/Climbing Animations/ClimbDown.FBX new file mode 100644 index 0000000..24e3030 --- /dev/null +++ b/Raw Content/Climbing Animations/ClimbDown.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3cf466ca09a7d6277279d571acd37b7c752a62744a04416f9798b27b6daaeed +size 2012560 diff --git a/Raw Content/Climbing Animations/ClimbIdle.FBX b/Raw Content/Climbing Animations/ClimbIdle.FBX new file mode 100644 index 0000000..3d7fe1e --- /dev/null +++ b/Raw Content/Climbing Animations/ClimbIdle.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00c2067dd1c395f480b05567ac5d461e957302bf41431dee9c7db2ab8444d13e +size 3156160 diff --git a/Raw Content/Climbing Animations/ClimbLeft.FBX b/Raw Content/Climbing Animations/ClimbLeft.FBX new file mode 100644 index 0000000..cc7fe52 --- /dev/null +++ b/Raw Content/Climbing Animations/ClimbLeft.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d08264076d1d5ca9f79a5a412f05b27c6c01499e9b9f36392da98718247c36dd +size 2391520 diff --git a/Raw Content/Climbing Animations/ClimbRight.FBX b/Raw Content/Climbing Animations/ClimbRight.FBX new file mode 100644 index 0000000..d88bc92 --- /dev/null +++ b/Raw Content/Climbing Animations/ClimbRight.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70ac68f78fcbc53cb50cd9f25d398b167280fc98fdc7ce20595564d8215052fa +size 2391520 diff --git a/Raw Content/Climbing Animations/ClimbUp.FBX b/Raw Content/Climbing Animations/ClimbUp.FBX new file mode 100644 index 0000000..598f11d --- /dev/null +++ b/Raw Content/Climbing Animations/ClimbUp.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4052e8f689488e97836bfd19940b38d3206d46438cf3cdc6c0a7e4e5bc821b99 +size 3353328 From 8a03a981dbb079809f47f6c2dee635e141e5b9df Mon Sep 17 00:00:00 2001 From: Nyx Date: Wed, 17 Sep 2025 19:44:18 -0600 Subject: [PATCH 06/33] imported animations --- .../Characters/Mannequin_UE4/Animations/ClimbDown.uasset | 3 +++ .../Characters/Mannequin_UE4/Animations/ClimbIdle.uasset | 3 +++ .../Characters/Mannequin_UE4/Animations/ClimbLeft.uasset | 3 +++ .../Characters/Mannequin_UE4/Animations/ClimbRight.uasset | 3 +++ .../Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbDown.uasset create mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbIdle.uasset create mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbLeft.uasset create mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbRight.uasset create mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbDown.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbDown.uasset new file mode 100644 index 0000000..98ea35b --- /dev/null +++ b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbDown.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdf6e98f70b6b1bef3e89c5b2abf09125ca397da50b6d9dfc6ce5c716faba6f9 +size 603793 diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbIdle.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbIdle.uasset new file mode 100644 index 0000000..59efe26 --- /dev/null +++ b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbIdle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:250703715a9a30596cf2cad6f5c1897d6c68b2d408e5b674e3bf9a625454823a +size 680930 diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbLeft.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbLeft.uasset new file mode 100644 index 0000000..0566a04 --- /dev/null +++ b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:253132de0fa52b4603ecf00c5a9fcac801bbc07cb811d5608ceac80c55896c2f +size 376022 diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbRight.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbRight.uasset new file mode 100644 index 0000000..fec3ae1 --- /dev/null +++ b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e19e600187971a78742fab9f4069d8c8a564b3533ae49e739385712b7ecb5487 +size 371572 diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset new file mode 100644 index 0000000..3c2ed7d --- /dev/null +++ b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9065ba89293b671002ac79b12a59ccc7efa832e1304013642ae8d6adba307df2 +size 603779 From 90a02164bc4eb5cd9bd8482e4803b63ea1df596f Mon Sep 17 00:00:00 2001 From: Nyx Date: Wed, 17 Sep 2025 20:13:10 -0600 Subject: [PATCH 07/33] work on climbing animations --- .../Characters/Mannequin_UE4/Animations/ClimbDown.uasset | 3 --- .../Characters/Mannequin_UE4/Animations/ClimbIdle.uasset | 3 --- .../Characters/Mannequin_UE4/Animations/ClimbLeft.uasset | 3 --- .../Characters/Mannequin_UE4/Animations/ClimbRight.uasset | 3 --- .../Characters/Mannequin_UE4/Animations/ClimbUp.uasset | 3 --- .../Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset | 4 ++-- .../Content/MAIN_CONTENT/Animations/Climbing/ClimbDown.uasset | 3 +++ .../Content/MAIN_CONTENT/Animations/Climbing/ClimbIdle.uasset | 3 +++ .../Content/MAIN_CONTENT/Animations/Climbing/ClimbLeft.uasset | 3 +++ .../MAIN_CONTENT/Animations/Climbing/ClimbRight.uasset | 3 +++ .../Content/MAIN_CONTENT/Animations/Climbing/ClimbUp.uasset | 3 +++ .../Animations/Climbing/ClimbingBlendSpace.uasset | 3 +++ .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset | 3 +++ .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset | 3 +++ .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset | 3 +++ .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset | 3 +++ .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset | 3 +++ .../Animations/Climbing/UE4_ClimbingBlendSpace.uasset | 3 +++ .../MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset | 4 ++-- .../MAIN_CONTENT/Blueprints/BP_PlayerController.uasset | 4 ++-- .../ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- .../Content/ThirdPerson/Input/Actions/IA_Climb.uasset | 3 +++ Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset | 4 ++-- 23 files changed, 49 insertions(+), 25 deletions(-) delete mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbDown.uasset delete mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbIdle.uasset delete mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbLeft.uasset delete mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbRight.uasset delete mode 100644 Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbDown.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbIdle.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbLeft.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbRight.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbUp.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbingBlendSpace.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbingBlendSpace.uasset create mode 100644 Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_Climb.uasset diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbDown.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbDown.uasset deleted file mode 100644 index 98ea35b..0000000 --- a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbDown.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdf6e98f70b6b1bef3e89c5b2abf09125ca397da50b6d9dfc6ce5c716faba6f9 -size 603793 diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbIdle.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbIdle.uasset deleted file mode 100644 index 59efe26..0000000 --- a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbIdle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:250703715a9a30596cf2cad6f5c1897d6c68b2d408e5b674e3bf9a625454823a -size 680930 diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbLeft.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbLeft.uasset deleted file mode 100644 index 0566a04..0000000 --- a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:253132de0fa52b4603ecf00c5a9fcac801bbc07cb811d5608ceac80c55896c2f -size 376022 diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbRight.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbRight.uasset deleted file mode 100644 index fec3ae1..0000000 --- a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e19e600187971a78742fab9f4069d8c8a564b3533ae49e739385712b7ecb5487 -size 371572 diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset deleted file mode 100644 index 3c2ed7d..0000000 --- a/Elistria_Calling/Content/Characters/Mannequin_UE4/Animations/ClimbUp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9065ba89293b671002ac79b12a59ccc7efa832e1304013642ae8d6adba307df2 -size 603779 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset index a194ac4..103c95a 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bef0bb7c1aac2fc3baaee7363d7ec5ff8858e1f689b120a8371796e6c83ea208 -size 476741 +oid sha256:992b568041bd9b6223e31016f6d5e7790698c9d09d6a4db78fd256670c4c2e8c +size 569350 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbDown.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbDown.uasset new file mode 100644 index 0000000..4f71918 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbDown.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03065e1833aea3085f2faafd592099e978b0fe40b5ce10d0191bb3677a0a8389 +size 603787 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbIdle.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbIdle.uasset new file mode 100644 index 0000000..13af756 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbIdle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7062fb48312e953575c0cbdf0f7db85e2265fe8a8cf1cc33dee169b47903033 +size 680924 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbLeft.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbLeft.uasset new file mode 100644 index 0000000..1aa8a33 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b853cd77a64642e943d613dd3e598516635378f3ceed075e76d77e94e2f94451 +size 376016 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbRight.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbRight.uasset new file mode 100644 index 0000000..522c981 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa917d76bd233420ef9b2d87ad535a91d10f6ff5be94e975b43b55ec0a2079d3 +size 371566 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbUp.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbUp.uasset new file mode 100644 index 0000000..a916080 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed7708f3cdf4c8330d26f05b81fa79ca0abf66252d097bf09f3bc039f9df8616 +size 603773 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbingBlendSpace.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbingBlendSpace.uasset new file mode 100644 index 0000000..b6ac9be --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/ClimbingBlendSpace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a106c160156974da232c5c33cc29015b3db94a25ebc0d304f0a1f57f7aeb2da +size 14444 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset new file mode 100644 index 0000000..2d21028 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:321b00e0fc213c951ee1e1a7cf597ba78d78655124bc39ecbe1692581cfae1e8 +size 748170 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset new file mode 100644 index 0000000..7316748 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ff7edad9382a6bf261d3bcf16c34eb7de55195c9aa58e057948bd2406b5f4f6 +size 779049 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset new file mode 100644 index 0000000..4bf40ef --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be1d567f655a2702377fef49104251cb92f15a4966f0a9ef8c692d3fe3724f9f +size 438377 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset new file mode 100644 index 0000000..f0bca46 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7339fcecab3d5650c0c56fa66221b103135fd7cf65a70095a641d478a7f80068 +size 438463 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset new file mode 100644 index 0000000..adcdce4 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86c3d3a290b3bb175b0d2c4f852ee2c02df7fb4a98a1dfb428db7514be49353e +size 748156 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbingBlendSpace.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbingBlendSpace.uasset new file mode 100644 index 0000000..cf5b036 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbingBlendSpace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16a33c10eecca0d6bf202753c516698d99d4342edfb0f8196c74d5837bcc768e +size 14884 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset index 7e90f64..5cf5194 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4513aea0b1fd696d8b2d966dc8a3689ff2854b540d0013e52efdbbaff8923a71 -size 46380 +oid sha256:2c25f45a6f638c297198aa17a7a3cfdcb8b94c071ad29b6f88eb005b4311e4fd +size 49543 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset index 51e41d9..ad8471e 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:132f887b0172d93247c480b7c570abaa4fc9dfe83782761266983b0889705ac1 -size 294563 +oid sha256:08ea069df696ac3a1c2b61092fc496d37548788e3b5a72e70d61d02d86bfac5a +size 304129 diff --git a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 96b122a..970f779 100644 --- a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d81436aaaa88a95ed3c577f44af5264c39b7d8d3832eaa2d1fa1607591e1f0f2 -size 1108433 +oid sha256:b1da5536a189e73f18dc1436489ca6bfd16f2ad05e436c698d96dbab84cec788 +size 1278785 diff --git a/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_Climb.uasset b/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_Climb.uasset new file mode 100644 index 0000000..7185cb2 --- /dev/null +++ b/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_Climb.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0faa8bc238461250fc1cf55d8fbaddb9cf72071e116f285ee86ae0a4c6076445 +size 1393 diff --git a/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset b/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset index 0e29340..d4c9129 100644 --- a/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2d81b3098cced549aeb67d747369f39b12cb1302d19b27ca0eb52545b388c7e -size 20318 +oid sha256:dd1f92d777e7f72a6ee126c5423c68db6a76d71f8a3ee23553e98ab1f71f6397 +size 20993 From 38515949db5a97481319c43ef4f04ea2dabb65b0 Mon Sep 17 00:00:00 2001 From: Nyx Date: Wed, 17 Sep 2025 20:44:57 -0600 Subject: [PATCH 08/33] added mantle climb anim --- Raw Content/Climbing Animations/MantleLedge.FBX | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Raw Content/Climbing Animations/MantleLedge.FBX diff --git a/Raw Content/Climbing Animations/MantleLedge.FBX b/Raw Content/Climbing Animations/MantleLedge.FBX new file mode 100644 index 0000000..d0afc47 --- /dev/null +++ b/Raw Content/Climbing Animations/MantleLedge.FBX @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a950aa047bb4747ce0e75a939d005e6ba46b8c708bbc9d4ded2a739cea46d92 +size 1553792 From d24a91176118521c4a829adaf2dd0ce9686e36d4 Mon Sep 17 00:00:00 2001 From: Nyx Date: Wed, 17 Sep 2025 22:18:55 -0600 Subject: [PATCH 09/33] completed climbing system --- .../Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset | 4 ++-- .../MAIN_CONTENT/Animations/Climbing/MantleLedge.uasset | 3 +++ .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset | 4 ++-- .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset | 4 ++-- .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset | 4 ++-- .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset | 4 ++-- .../MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset | 4 ++-- .../MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge.uasset | 3 +++ .../Animations/Climbing/UE4_MantleLedge_Montage.uasset | 3 +++ .../MAIN_CONTENT/Blueprints/BP_PlayerController.uasset | 4 ++-- .../MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset | 4 ++-- .../ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- 12 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/MantleLedge.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge_Montage.uasset diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset index 103c95a..e3ff913 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/ABP_RPGCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:992b568041bd9b6223e31016f6d5e7790698c9d09d6a4db78fd256670c4c2e8c -size 569350 +oid sha256:b34577cd4519b0bf1758f00dd2a0bb4c76a30c3b34cb2300b295eaf64e69b296 +size 581562 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/MantleLedge.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/MantleLedge.uasset new file mode 100644 index 0000000..f1ae26e --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/MantleLedge.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4980b56de596564ae779139000cec51344fbce4c15ee4d626f99e2e990f2482 +size 904634 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset index 2d21028..9335d75 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbDown.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:321b00e0fc213c951ee1e1a7cf597ba78d78655124bc39ecbe1692581cfae1e8 -size 748170 +oid sha256:2ff407590cf0f5458ba3cbd96f3b48b789ca7c8f06dc73143e0f5fd494f141fb +size 756809 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset index 7316748..5a8c0bb 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbIdle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ff7edad9382a6bf261d3bcf16c34eb7de55195c9aa58e057948bd2406b5f4f6 -size 779049 +oid sha256:5f33339c6a1df7f1e5b0fc02e23364df3f386ffeda3a84991287f7477d0cae76 +size 787604 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset index 4bf40ef..6026690 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbLeft.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be1d567f655a2702377fef49104251cb92f15a4966f0a9ef8c692d3fe3724f9f -size 438377 +oid sha256:fc07803310d1f8756a9fe30ff79e4ec61fa5edf2e44d905aa567535687801999 +size 446935 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset index f0bca46..41f7cff 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbRight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7339fcecab3d5650c0c56fa66221b103135fd7cf65a70095a641d478a7f80068 -size 438463 +oid sha256:522a482389ed700d594d3d8d76f6fcf660c04e773cc92229962f269c7661d216 +size 447028 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset index adcdce4..993d6cd 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_ClimbUp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86c3d3a290b3bb175b0d2c4f852ee2c02df7fb4a98a1dfb428db7514be49353e -size 748156 +oid sha256:b09a0325de74a631d0321da054b22c11fc03b37374ae60437d48b6242e0aba41 +size 756739 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge.uasset new file mode 100644 index 0000000..383b8f1 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b0f5fc973f289ba85b6d653070b19d9377a8680a62c125236c08e57937c3c59 +size 567669 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge_Montage.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge_Montage.uasset new file mode 100644 index 0000000..c3039b9 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Animations/Climbing/UE4_MantleLedge_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d78d93fc39e29c9a608f1710173d505613a97123946dbcb1cc2eca77aba95c02 +size 16152 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset index ad8471e..9e56530 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08ea069df696ac3a1c2b61092fc496d37548788e3b5a72e70d61d02d86bfac5a -size 304129 +oid sha256:feba551fd077937c51aaf9215ed5885933b8658662db0c710cf4ba924c662175 +size 399441 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset index e22aee8..1f9bbbc 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cbef88fb1f2337a44720d35ccf444382c68bcd5423c897406472f878adaa094 -size 210158 +oid sha256:15f0d83bcb53f6674ec3613ce10c9fce449de5d321e88934caed0b25f106d335 +size 205854 diff --git a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index 970f779..b8bcfc0 100644 --- a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1da5536a189e73f18dc1436489ca6bfd16f2ad05e436c698d96dbab84cec788 -size 1278785 +oid sha256:7b67b2301c2e058c32fe366dafc0ec81425634d49fdbb1b7d503e3f5504dbffe +size 1466763 From efd2a40ff2e9300acf2e99746a0070ebc6cf650d Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 18 Sep 2025 23:21:12 -0600 Subject: [PATCH 10/33] Modeled and UV'd Trees --- Raw Content/Models/trees/SM_Tree_Birch_Large1.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Birch_Large2.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Birch_Large3.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Birch_Mid1.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Birch_Mid2.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Birch_Mid3.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Birch_Mid4.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Birch_Small1.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Birch_Small2.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Oak1.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Oak2.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Oak3.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Oak4.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Large1.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Large2.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Large3.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Large4.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Mid1.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Mid2.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Mid3.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Mid4.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Mid5.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Small1.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Small2.fbx | 3 +++ Raw Content/Models/trees/SM_Tree_Pine_Small3.fbx | 3 +++ 25 files changed, 75 insertions(+) create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Large1.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Large2.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Large3.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Mid1.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Mid2.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Mid3.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Mid4.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Small1.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Birch_Small2.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Oak1.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Oak2.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Oak3.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Oak4.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Large1.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Large2.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Large3.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Large4.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Mid1.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Mid2.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Mid3.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Mid4.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Mid5.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Small1.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Small2.fbx create mode 100644 Raw Content/Models/trees/SM_Tree_Pine_Small3.fbx diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Large1.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Large1.fbx new file mode 100644 index 0000000..399d58d --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Large1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac078c428330f421f330c9498a001b4a4e0063c82daf26301f1a27e77cb48013 +size 264160 diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Large2.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Large2.fbx new file mode 100644 index 0000000..3799134 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Large2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9e260670a14c6184285536be17ed2cc5f8a6587193f0333e44704386ee68310 +size 329616 diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Large3.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Large3.fbx new file mode 100644 index 0000000..9a0c36f --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Large3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e94dac44f2c14a6cc33bc91a7febed76161aa662e6530779b861404557e852b +size 503248 diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Mid1.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Mid1.fbx new file mode 100644 index 0000000..dfff0e0 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Mid1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba0a05cf89d6cb704efe24b96c5da1a7632cd37d6344481eb8439097df59ba4b +size 261424 diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Mid2.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Mid2.fbx new file mode 100644 index 0000000..cb7146b --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Mid2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55d4348de17061b080c6a8c9508dc810916143ad90e95fa4c1c10243cd3e882e +size 331072 diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Mid3.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Mid3.fbx new file mode 100644 index 0000000..27670b8 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Mid3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df860ecb4c70588ca8c2b86bf5bf5d3326b471b4529d19009f07c8a3d5b758d0 +size 554464 diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Mid4.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Mid4.fbx new file mode 100644 index 0000000..b068de3 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Mid4.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1fa58cdf5f0ed20aa1a76589d731ec41de830323d4d415c0c5fcef1c542450f +size 449168 diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Small1.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Small1.fbx new file mode 100644 index 0000000..ec1d928 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Small1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f18b1a9684a196273053c17b381b4b51dde7ddcb1a3bf75130584c35191b59f9 +size 271328 diff --git a/Raw Content/Models/trees/SM_Tree_Birch_Small2.fbx b/Raw Content/Models/trees/SM_Tree_Birch_Small2.fbx new file mode 100644 index 0000000..69c1fc0 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Birch_Small2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65e3d8d681a9178e522a3637ef7a98e4aa98cde3ce5b3640f22138b88aa136cf +size 254816 diff --git a/Raw Content/Models/trees/SM_Tree_Oak1.fbx b/Raw Content/Models/trees/SM_Tree_Oak1.fbx new file mode 100644 index 0000000..c4ca727 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Oak1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea0818bb604235e2e531ad7ab1bb1f6d6cf5932c4c5bc9c73407613b38cf2254 +size 633712 diff --git a/Raw Content/Models/trees/SM_Tree_Oak2.fbx b/Raw Content/Models/trees/SM_Tree_Oak2.fbx new file mode 100644 index 0000000..1e97668 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Oak2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65fb617189886b7ec45f185b7cd4ab36b8a564a97c18697a1a5c6afeb176de6b +size 449472 diff --git a/Raw Content/Models/trees/SM_Tree_Oak3.fbx b/Raw Content/Models/trees/SM_Tree_Oak3.fbx new file mode 100644 index 0000000..d8eb408 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Oak3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9850bf3f120dfdedbbc57a7fd19d56861e5a43c0c2cf053b45fa6afe8b1cf361 +size 450784 diff --git a/Raw Content/Models/trees/SM_Tree_Oak4.fbx b/Raw Content/Models/trees/SM_Tree_Oak4.fbx new file mode 100644 index 0000000..41e7f17 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Oak4.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eeac3de62529b225da242a9324202644b1eb53aed482adae88ff9c080c17525 +size 261152 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Large1.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Large1.fbx new file mode 100644 index 0000000..05abfdd --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Large1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48bd73d629a79f56ec132814fdf6a10e89ca3aada7565154e5d69ddd32b2fbdf +size 322480 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Large2.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Large2.fbx new file mode 100644 index 0000000..73da796 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Large2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1a3dd0aa537ca54232ff83870df67be70ad3166504de5684c48305efcc22f68 +size 217840 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Large3.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Large3.fbx new file mode 100644 index 0000000..30faa55 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Large3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b6cf093d3e69e77b36bfaf9197e5b5912e4ba0be88a02e6008e072045ca85dd +size 217984 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Large4.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Large4.fbx new file mode 100644 index 0000000..cff1b48 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Large4.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f613b951c2ca6bd3823c84cf79414ad83b608de6adf1b309c7fdd19a6869edf1 +size 326112 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Mid1.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Mid1.fbx new file mode 100644 index 0000000..ed02be2 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Mid1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc99e94ccd11fb8e5abb8de1ae0c08be12fbab91ca8d99a00524c3d532411f76 +size 181568 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Mid2.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Mid2.fbx new file mode 100644 index 0000000..a0f00eb --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Mid2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f813764965f02d9cf8166422fc4a8683e61cd98aa909b585bb07fb1aef978e28 +size 258544 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Mid3.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Mid3.fbx new file mode 100644 index 0000000..6e26ad6 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Mid3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b31aad0eae6a5ab6ee93b6aafbcfb6ff6e70cbbee43235cd1de05cbe53167fab +size 188128 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Mid4.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Mid4.fbx new file mode 100644 index 0000000..852a4de --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Mid4.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f80e3ed16a303ac211c83eab89d3b654cd0ec52e554077800b889b6cffb3790b +size 182752 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Mid5.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Mid5.fbx new file mode 100644 index 0000000..b507231 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Mid5.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfb2b5ffa537726f11d29943637bf486482cebfef336f86281584b7df4dfb928 +size 187728 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Small1.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Small1.fbx new file mode 100644 index 0000000..85d8e86 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Small1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5750e2802f16af9a59c0cda20eedb1164277da4e98446f5f6bf4edcd5c3090f7 +size 147472 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Small2.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Small2.fbx new file mode 100644 index 0000000..d5ed283 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Small2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68d4543dbd4355473df996bac5f2ab850e4b4d9ef9debb31077453a2daa942e2 +size 154384 diff --git a/Raw Content/Models/trees/SM_Tree_Pine_Small3.fbx b/Raw Content/Models/trees/SM_Tree_Pine_Small3.fbx new file mode 100644 index 0000000..d41b6b9 --- /dev/null +++ b/Raw Content/Models/trees/SM_Tree_Pine_Small3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f47239b13e8389344e5b211b1c4f99a7d39bf74feaf385386e1d5e31659a593b +size 179104 From 90b74d02d731dc2fa1da7bc01036e70e9da5343c Mon Sep 17 00:00:00 2001 From: G-ranium <156252946+G-ranium@users.noreply.github.com> Date: Mon, 22 Sep 2025 23:10:33 -0600 Subject: [PATCH 11/33] Town hall finished and UV mapped --- Raw Content/SM_Town_Hall.fbx | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Raw Content/SM_Town_Hall.fbx diff --git a/Raw Content/SM_Town_Hall.fbx b/Raw Content/SM_Town_Hall.fbx new file mode 100644 index 0000000..5b3b862 --- /dev/null +++ b/Raw Content/SM_Town_Hall.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3383de088adda9f4190afdad5269f7e9c106a3816c182c90de65f5e8214fddba +size 3232688 From 4edd7b2fac488670f83f74a969831c5c75fd74c3 Mon Sep 17 00:00:00 2001 From: Nyx Date: Tue, 23 Sep 2025 09:33:35 -0600 Subject: [PATCH 12/33] Enabled unreal plugins for ease of development --- Elistria_Calling/Elistria_Calling.uproject | 112 +++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/Elistria_Calling/Elistria_Calling.uproject b/Elistria_Calling/Elistria_Calling.uproject index 60b315c..756986a 100644 --- a/Elistria_Calling/Elistria_Calling.uproject +++ b/Elistria_Calling/Elistria_Calling.uproject @@ -38,6 +38,118 @@ { "Name": "Iris", "Enabled": true + }, + { + "Name": "GameplayBehaviors", + "Enabled": true + }, + { + "Name": "MultiUserClient", + "Enabled": true + }, + { + "Name": "SunPosition", + "Enabled": true + }, + { + "Name": "ChaosClothAsset", + "Enabled": true + }, + { + "Name": "NaniteDisplacedMesh", + "Enabled": true + }, + { + "Name": "CommonUI", + "Enabled": true + }, + { + "Name": "HDRIBackdrop", + "Enabled": true + }, + { + "Name": "ChaosVehiclesPlugin", + "Enabled": true + }, + { + "Name": "ChaosModularVehicle", + "Enabled": true + }, + { + "Name": "ChaosClothAssetEditor", + "Enabled": true + }, + { + "Name": "GeoReferencing", + "Enabled": true + }, + { + "Name": "LandscapePatch", + "Enabled": true + }, + { + "Name": "PCGBiomeCore", + "Enabled": true + }, + { + "Name": "StateGraph", + "Enabled": true + }, + { + "Name": "SurfaceEffects", + "Enabled": true + }, + { + "Name": "GameFeatures", + "Enabled": true + }, + { + "Name": "GameplayAbilities", + "Enabled": true + }, + { + "Name": "AbilitySystemGameFeatureActions", + "Enabled": true + }, + { + "Name": "DataRegistry", + "Enabled": true + }, + { + "Name": "GameplayStateTree", + "Enabled": true + }, + { + "Name": "ModularGameplay", + "Enabled": true + }, + { + "Name": "TargetingSystem", + "Enabled": true + }, + { + "Name": "StateTree", + "Enabled": true + }, + { + "Name": "SmartObjects", + "Enabled": true + }, + { + "Name": "NetworkPrediction", + "Enabled": true + }, + { + "Name": "MassEntity", + "Enabled": true + }, + { + "Name": "GameplayInteractions", + "Enabled": true + }, + { + "Name": "PropertyBindingUtils", + "Enabled": true } ] } \ No newline at end of file From a6698b073e91178f419dff51f46c9eadb6d71cc3 Mon Sep 17 00:00:00 2001 From: Nyx Date: Tue, 23 Sep 2025 10:00:05 -0600 Subject: [PATCH 13/33] even more plugin management --- Elistria_Calling/Elistria_Calling.uproject | 139 +++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/Elistria_Calling/Elistria_Calling.uproject b/Elistria_Calling/Elistria_Calling.uproject index 756986a..b590f8f 100644 --- a/Elistria_Calling/Elistria_Calling.uproject +++ b/Elistria_Calling/Elistria_Calling.uproject @@ -150,6 +150,145 @@ { "Name": "PropertyBindingUtils", "Enabled": true + }, + { + "Name": "OnlineSubsystemGooglePlay", + "Enabled": false, + "SupportedTargetPlatforms": [ + "Android" + ] + }, + { + "Name": "AndroidPermission", + "Enabled": false + }, + { + "Name": "AndroidFileServer", + "Enabled": false + }, + { + "Name": "GooglePAD", + "Enabled": false + }, + { + "Name": "MassAI", + "Enabled": true + }, + { + "Name": "MassCrowd", + "Enabled": true + }, + { + "Name": "Soundscape", + "Enabled": true + }, + { + "Name": "JsonBlueprintUtilities", + "Enabled": true + }, + { + "Name": "BlueprintFileUtils", + "Enabled": true + }, + { + "Name": "ContentBrowserAliasDataSource", + "Enabled": true + }, + { + "Name": "Mutable", + "Enabled": true + }, + { + "Name": "OptiXDenoise", + "Enabled": true + }, + { + "Name": "PCGExternalDataInterop", + "Enabled": true + }, + { + "Name": "PCGWaterInterop", + "Enabled": true + }, + { + "Name": "ActorPalette", + "Enabled": true + }, + { + "Name": "AdvancedRenamer", + "Enabled": true + }, + { + "Name": "NiagaraFluids", + "Enabled": true + }, + { + "Name": "AndroidMedia", + "Enabled": false + }, + { + "Name": "AndroidMoviePlayer", + "Enabled": false + }, + { + "Name": "AppleMoviePlayer", + "Enabled": false + }, + { + "Name": "AvfMedia", + "Enabled": false + }, + { + "Name": "LocationServicesBPLibrary", + "Enabled": false + }, + { + "Name": "MobilePatchingUtils", + "Enabled": false + }, + { + "Name": "GoogleCloudMessaging", + "Enabled": false + }, + { + "Name": "OnlineSubsystemIOS", + "Enabled": false, + "SupportedTargetPlatforms": [ + "IOS", + "TVOS" + ] + }, + { + "Name": "ColorCorrectRegions", + "Enabled": true + }, + { + "Name": "Reflex", + "Enabled": true + }, + { + "Name": "ChaosFlesh", + "Enabled": true + }, + { + "Name": "CodeView", + "Enabled": true + }, + { + "Name": "CodeEditor", + "Enabled": true + }, + { + "Name": "SubversionSourceControl", + "Enabled": false + }, + { + "Name": "PlasticSourceControl", + "Enabled": false + }, + { + "Name": "PerforceSourceControl", + "Enabled": false } ] } \ No newline at end of file From a42fb6e25dc2d79738518bec84c4746569596840 Mon Sep 17 00:00:00 2001 From: Nyx Date: Tue, 23 Sep 2025 10:00:05 -0600 Subject: [PATCH 14/33] even more plugin management --- Elistria_Calling/Config/DefaultGame.ini | 16 ++- Elistria_Calling/Elistria_Calling.uproject | 139 +++++++++++++++++++++ 2 files changed, 154 insertions(+), 1 deletion(-) diff --git a/Elistria_Calling/Config/DefaultGame.ini b/Elistria_Calling/Config/DefaultGame.ini index a045161..b403098 100644 --- a/Elistria_Calling/Config/DefaultGame.ini +++ b/Elistria_Calling/Config/DefaultGame.ini @@ -10,4 +10,18 @@ InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent") +Section=StartupActions [/Script/AIModule.AISense_Sight] -bAutoRegisterAllPawnsAsSources=false \ No newline at end of file +bAutoRegisterAllPawnsAsSources=false + +[/Script/Engine.AssetManagerSettings] +-PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass=/Script/Engine.World,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown)) +-PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass=/Script/Engine.PrimaryAssetLabel,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown)) ++PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass="/Script/Engine.World",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown)) ++PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass="/Script/Engine.PrimaryAssetLabel",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown)) ++PrimaryAssetTypesToScan=(PrimaryAssetType="GameFeatureData",AssetBaseClass="/Script/GameFeatures.GameFeatureData",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=,SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=AlwaysCook)) +bOnlyCookProductionAssets=False +bShouldManagerDetermineTypeAndName=False +bShouldGuessTypeAndNameInEditor=True +bShouldAcquireMissingChunksOnLoad=False +bShouldWarnAboutInvalidAssets=True +MetaDataTagsForAssetRegistry=() + diff --git a/Elistria_Calling/Elistria_Calling.uproject b/Elistria_Calling/Elistria_Calling.uproject index 756986a..b590f8f 100644 --- a/Elistria_Calling/Elistria_Calling.uproject +++ b/Elistria_Calling/Elistria_Calling.uproject @@ -150,6 +150,145 @@ { "Name": "PropertyBindingUtils", "Enabled": true + }, + { + "Name": "OnlineSubsystemGooglePlay", + "Enabled": false, + "SupportedTargetPlatforms": [ + "Android" + ] + }, + { + "Name": "AndroidPermission", + "Enabled": false + }, + { + "Name": "AndroidFileServer", + "Enabled": false + }, + { + "Name": "GooglePAD", + "Enabled": false + }, + { + "Name": "MassAI", + "Enabled": true + }, + { + "Name": "MassCrowd", + "Enabled": true + }, + { + "Name": "Soundscape", + "Enabled": true + }, + { + "Name": "JsonBlueprintUtilities", + "Enabled": true + }, + { + "Name": "BlueprintFileUtils", + "Enabled": true + }, + { + "Name": "ContentBrowserAliasDataSource", + "Enabled": true + }, + { + "Name": "Mutable", + "Enabled": true + }, + { + "Name": "OptiXDenoise", + "Enabled": true + }, + { + "Name": "PCGExternalDataInterop", + "Enabled": true + }, + { + "Name": "PCGWaterInterop", + "Enabled": true + }, + { + "Name": "ActorPalette", + "Enabled": true + }, + { + "Name": "AdvancedRenamer", + "Enabled": true + }, + { + "Name": "NiagaraFluids", + "Enabled": true + }, + { + "Name": "AndroidMedia", + "Enabled": false + }, + { + "Name": "AndroidMoviePlayer", + "Enabled": false + }, + { + "Name": "AppleMoviePlayer", + "Enabled": false + }, + { + "Name": "AvfMedia", + "Enabled": false + }, + { + "Name": "LocationServicesBPLibrary", + "Enabled": false + }, + { + "Name": "MobilePatchingUtils", + "Enabled": false + }, + { + "Name": "GoogleCloudMessaging", + "Enabled": false + }, + { + "Name": "OnlineSubsystemIOS", + "Enabled": false, + "SupportedTargetPlatforms": [ + "IOS", + "TVOS" + ] + }, + { + "Name": "ColorCorrectRegions", + "Enabled": true + }, + { + "Name": "Reflex", + "Enabled": true + }, + { + "Name": "ChaosFlesh", + "Enabled": true + }, + { + "Name": "CodeView", + "Enabled": true + }, + { + "Name": "CodeEditor", + "Enabled": true + }, + { + "Name": "SubversionSourceControl", + "Enabled": false + }, + { + "Name": "PlasticSourceControl", + "Enabled": false + }, + { + "Name": "PerforceSourceControl", + "Enabled": false } ] } \ No newline at end of file From 955a44538804a330cfb4c2198bea4818c6657eca Mon Sep 17 00:00:00 2001 From: Zach Rawlings Date: Tue, 23 Sep 2025 10:41:43 -0600 Subject: [PATCH 15/33] Leather Armor + UV Wrap --- Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx | 3 +++ Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx | 3 +++ Raw Content/Models/Leather_Armor.fbx | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx create mode 100644 Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx create mode 100644 Raw Content/Models/Leather_Armor.fbx diff --git a/Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx b/Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx new file mode 100644 index 0000000..2270d60 --- /dev/null +++ b/Raw Content/Models/Animals/SM_Alligator/SM_Alligator.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f782f88691a2102eb8883d06599e3eb456cd7f69d8fda58ef85b4ca0cf897bc6 +size 239552 diff --git a/Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx b/Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx new file mode 100644 index 0000000..6279514 --- /dev/null +++ b/Raw Content/Models/Animals/SM_Alligator/SM_Alligator_Teeth.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:784a5faf7b01c82ae99ec1c75e63c41463da16489cc56b008dd49838c376136c +size 238896 diff --git a/Raw Content/Models/Leather_Armor.fbx b/Raw Content/Models/Leather_Armor.fbx new file mode 100644 index 0000000..72798b6 --- /dev/null +++ b/Raw Content/Models/Leather_Armor.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c271f8ce9430034929acc6a3b5b44b5facb65da9bb49389ba1badaeb4f038d9 +size 175312 From a17ce194433b629b965ce455bd24f8ebce223101 Mon Sep 17 00:00:00 2001 From: Allen Larsen Date: Tue, 23 Sep 2025 11:09:36 -0600 Subject: [PATCH 16/33] UV Mapped and modeled Decor made the corks, the version 1 bed, candles, book, and shelf. --- Raw Content/Models/decor/SM_BedV1.fbx | 3 +++ Raw Content/Models/{decor bottles => decor}/SM_Bottle.fbx | 0 Raw Content/Models/decor/SM_BottleWCork.fbx | 3 +++ Raw Content/Models/decor/SM_CandleHolder.fbx | 3 +++ Raw Content/Models/decor/SM_CandleV1.fbx | 3 +++ Raw Content/Models/decor/SM_CandleV2.fbx | 3 +++ Raw Content/Models/decor/SM_CandleV3.fbx | 3 +++ Raw Content/Models/decor/SM_CandleV4.fbx | 3 +++ Raw Content/Models/{decor bottles => decor}/SM_CubeBottle.fbx | 0 Raw Content/Models/decor/SM_CubeBottleWCork.fbx | 3 +++ .../Models/{decor bottles => decor}/SM_DimondBottle.fbx | 0 Raw Content/Models/decor/SM_DimondBottleWCork.fbx | 3 +++ .../Models/{decor bottles => decor}/SM_RectangleBottle.fbx | 0 .../Models/{decor bottles => decor}/SM_SkinnyVialBottle.fbx | 0 Raw Content/Models/decor/SM_SkinnyVialBottleWcork.fbx | 3 +++ Raw Content/Models/{decor bottles => decor}/SM_TallBottle.fbx | 0 Raw Content/Models/decor/SM_TallBottleWCork.fbx | 3 +++ .../Models/{decor bottles => decor}/SM_TriangleBottle.fbx | 0 Raw Content/Models/{decor bottles => decor}/SM_VialBottle.fbx | 0 Raw Content/Models/decor/SM_VialBottleWCorkIn.fbx | 3 +++ Raw Content/Models/decor/SM_WoodShelf.fbx | 3 +++ Raw Content/Models/decor/SM_bookV1.fbx | 3 +++ 22 files changed, 42 insertions(+) create mode 100644 Raw Content/Models/decor/SM_BedV1.fbx rename Raw Content/Models/{decor bottles => decor}/SM_Bottle.fbx (100%) create mode 100644 Raw Content/Models/decor/SM_BottleWCork.fbx create mode 100644 Raw Content/Models/decor/SM_CandleHolder.fbx create mode 100644 Raw Content/Models/decor/SM_CandleV1.fbx create mode 100644 Raw Content/Models/decor/SM_CandleV2.fbx create mode 100644 Raw Content/Models/decor/SM_CandleV3.fbx create mode 100644 Raw Content/Models/decor/SM_CandleV4.fbx rename Raw Content/Models/{decor bottles => decor}/SM_CubeBottle.fbx (100%) create mode 100644 Raw Content/Models/decor/SM_CubeBottleWCork.fbx rename Raw Content/Models/{decor bottles => decor}/SM_DimondBottle.fbx (100%) create mode 100644 Raw Content/Models/decor/SM_DimondBottleWCork.fbx rename Raw Content/Models/{decor bottles => decor}/SM_RectangleBottle.fbx (100%) rename Raw Content/Models/{decor bottles => decor}/SM_SkinnyVialBottle.fbx (100%) create mode 100644 Raw Content/Models/decor/SM_SkinnyVialBottleWcork.fbx rename Raw Content/Models/{decor bottles => decor}/SM_TallBottle.fbx (100%) create mode 100644 Raw Content/Models/decor/SM_TallBottleWCork.fbx rename Raw Content/Models/{decor bottles => decor}/SM_TriangleBottle.fbx (100%) rename Raw Content/Models/{decor bottles => decor}/SM_VialBottle.fbx (100%) create mode 100644 Raw Content/Models/decor/SM_VialBottleWCorkIn.fbx create mode 100644 Raw Content/Models/decor/SM_WoodShelf.fbx create mode 100644 Raw Content/Models/decor/SM_bookV1.fbx diff --git a/Raw Content/Models/decor/SM_BedV1.fbx b/Raw Content/Models/decor/SM_BedV1.fbx new file mode 100644 index 0000000..951b678 --- /dev/null +++ b/Raw Content/Models/decor/SM_BedV1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:504eea2b6c365df7fe5837feaa5cc6d85438dc9d3247a6bf37969b04d1ff054d +size 43664 diff --git a/Raw Content/Models/decor bottles/SM_Bottle.fbx b/Raw Content/Models/decor/SM_Bottle.fbx similarity index 100% rename from Raw Content/Models/decor bottles/SM_Bottle.fbx rename to Raw Content/Models/decor/SM_Bottle.fbx diff --git a/Raw Content/Models/decor/SM_BottleWCork.fbx b/Raw Content/Models/decor/SM_BottleWCork.fbx new file mode 100644 index 0000000..64b2cf7 --- /dev/null +++ b/Raw Content/Models/decor/SM_BottleWCork.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3049c48457c14880fa97d4c8366dc8ff5293ac55ef6af8f768991a3d07d5c010 +size 42912 diff --git a/Raw Content/Models/decor/SM_CandleHolder.fbx b/Raw Content/Models/decor/SM_CandleHolder.fbx new file mode 100644 index 0000000..53fb5c2 --- /dev/null +++ b/Raw Content/Models/decor/SM_CandleHolder.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b90dd934bddf73fb631c3854c77bf768fb4243a54180f982929ea9c29efdf620 +size 39392 diff --git a/Raw Content/Models/decor/SM_CandleV1.fbx b/Raw Content/Models/decor/SM_CandleV1.fbx new file mode 100644 index 0000000..1966693 --- /dev/null +++ b/Raw Content/Models/decor/SM_CandleV1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4c8c5f494fa3f36578f2cf416813f43f64668dac586508dc53c8a6b8c475352 +size 40720 diff --git a/Raw Content/Models/decor/SM_CandleV2.fbx b/Raw Content/Models/decor/SM_CandleV2.fbx new file mode 100644 index 0000000..14a709e --- /dev/null +++ b/Raw Content/Models/decor/SM_CandleV2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b7aa2b7207a1f170d905c83f722f676cf0c9d5a676d0b6c74c88bb49b035cb3 +size 40672 diff --git a/Raw Content/Models/decor/SM_CandleV3.fbx b/Raw Content/Models/decor/SM_CandleV3.fbx new file mode 100644 index 0000000..1684c4e --- /dev/null +++ b/Raw Content/Models/decor/SM_CandleV3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d1c0484cc29043b943f93488fd7ba47e9fff998a51aba96e4e458c8c832abe3 +size 40880 diff --git a/Raw Content/Models/decor/SM_CandleV4.fbx b/Raw Content/Models/decor/SM_CandleV4.fbx new file mode 100644 index 0000000..0e9ebc6 --- /dev/null +++ b/Raw Content/Models/decor/SM_CandleV4.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c780ad83f8eeb7b49c4aceb86265b465df8d25b7a908c805aea11cd49b3f5b59 +size 40800 diff --git a/Raw Content/Models/decor bottles/SM_CubeBottle.fbx b/Raw Content/Models/decor/SM_CubeBottle.fbx similarity index 100% rename from Raw Content/Models/decor bottles/SM_CubeBottle.fbx rename to Raw Content/Models/decor/SM_CubeBottle.fbx diff --git a/Raw Content/Models/decor/SM_CubeBottleWCork.fbx b/Raw Content/Models/decor/SM_CubeBottleWCork.fbx new file mode 100644 index 0000000..d63664d --- /dev/null +++ b/Raw Content/Models/decor/SM_CubeBottleWCork.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f647d8236ba226579871b52872ad8ade23583148aa3c6d50fb8635a68de4e178 +size 40416 diff --git a/Raw Content/Models/decor bottles/SM_DimondBottle.fbx b/Raw Content/Models/decor/SM_DimondBottle.fbx similarity index 100% rename from Raw Content/Models/decor bottles/SM_DimondBottle.fbx rename to Raw Content/Models/decor/SM_DimondBottle.fbx diff --git a/Raw Content/Models/decor/SM_DimondBottleWCork.fbx b/Raw Content/Models/decor/SM_DimondBottleWCork.fbx new file mode 100644 index 0000000..14cccf4 --- /dev/null +++ b/Raw Content/Models/decor/SM_DimondBottleWCork.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8103660875bb6f091fcc040e3212fd768adb6ff0b3f97e204a814e2b49fbf0e6 +size 43104 diff --git a/Raw Content/Models/decor bottles/SM_RectangleBottle.fbx b/Raw Content/Models/decor/SM_RectangleBottle.fbx similarity index 100% rename from Raw Content/Models/decor bottles/SM_RectangleBottle.fbx rename to Raw Content/Models/decor/SM_RectangleBottle.fbx diff --git a/Raw Content/Models/decor bottles/SM_SkinnyVialBottle.fbx b/Raw Content/Models/decor/SM_SkinnyVialBottle.fbx similarity index 100% rename from Raw Content/Models/decor bottles/SM_SkinnyVialBottle.fbx rename to Raw Content/Models/decor/SM_SkinnyVialBottle.fbx diff --git a/Raw Content/Models/decor/SM_SkinnyVialBottleWcork.fbx b/Raw Content/Models/decor/SM_SkinnyVialBottleWcork.fbx new file mode 100644 index 0000000..af7df2b --- /dev/null +++ b/Raw Content/Models/decor/SM_SkinnyVialBottleWcork.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1023c1403d89f052cc980c87da3c0817c65959d4b6aafab5c7098617133acd7e +size 40080 diff --git a/Raw Content/Models/decor bottles/SM_TallBottle.fbx b/Raw Content/Models/decor/SM_TallBottle.fbx similarity index 100% rename from Raw Content/Models/decor bottles/SM_TallBottle.fbx rename to Raw Content/Models/decor/SM_TallBottle.fbx diff --git a/Raw Content/Models/decor/SM_TallBottleWCork.fbx b/Raw Content/Models/decor/SM_TallBottleWCork.fbx new file mode 100644 index 0000000..547ec9c --- /dev/null +++ b/Raw Content/Models/decor/SM_TallBottleWCork.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd6548e3a7958c6a880d70bec05188ca13771381564cb06c25270ca508d8c8ea +size 43824 diff --git a/Raw Content/Models/decor bottles/SM_TriangleBottle.fbx b/Raw Content/Models/decor/SM_TriangleBottle.fbx similarity index 100% rename from Raw Content/Models/decor bottles/SM_TriangleBottle.fbx rename to Raw Content/Models/decor/SM_TriangleBottle.fbx diff --git a/Raw Content/Models/decor bottles/SM_VialBottle.fbx b/Raw Content/Models/decor/SM_VialBottle.fbx similarity index 100% rename from Raw Content/Models/decor bottles/SM_VialBottle.fbx rename to Raw Content/Models/decor/SM_VialBottle.fbx diff --git a/Raw Content/Models/decor/SM_VialBottleWCorkIn.fbx b/Raw Content/Models/decor/SM_VialBottleWCorkIn.fbx new file mode 100644 index 0000000..0166450 --- /dev/null +++ b/Raw Content/Models/decor/SM_VialBottleWCorkIn.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5eec7d323753ff1a3024712c577bc534a3b7fbb0a5988efec14d883dba6100d +size 38832 diff --git a/Raw Content/Models/decor/SM_WoodShelf.fbx b/Raw Content/Models/decor/SM_WoodShelf.fbx new file mode 100644 index 0000000..e6dc991 --- /dev/null +++ b/Raw Content/Models/decor/SM_WoodShelf.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:751d7dc086ae983eeadd7dd56ce121f8d396124ddf733c03bc50009a740539f6 +size 59088 diff --git a/Raw Content/Models/decor/SM_bookV1.fbx b/Raw Content/Models/decor/SM_bookV1.fbx new file mode 100644 index 0000000..14de407 --- /dev/null +++ b/Raw Content/Models/decor/SM_bookV1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eba9e9a68b75508b605a1d09e3e5b9a9be5590ae4c9536e26a03fa4eba07a6b +size 34976 From fbaff3beaf464c2150bb1bbe0af2c21658209559 Mon Sep 17 00:00:00 2001 From: Lily Wilson Date: Tue, 23 Sep 2025 17:02:41 -0600 Subject: [PATCH 17/33] Magick System UI Base + Other Shtuff --- Elistria_Calling/Config/DefaultEngine.ini | 17 +++++++++++++++++ .../Blueprints/BPC_PlayerStats.uasset | 4 ++-- .../Blueprints/BP_PlayerController.uasset | 4 ++-- .../Blueprints/BP_PlayerState.uasset | 4 ++-- .../Crafting_System/UI/WB_CraftMenuUI.uasset | 4 ++-- .../Crafting_System/UI/WB_RecipeSlot.uasset | 4 ++-- .../BPC_EquipmentSystem.uasset | 4 ++-- .../Equipment_System/UI/WB_Equipment.uasset | 4 ++-- .../Levels/L_German_Building_01.umap | 4 ++-- .../Magick_System/BPC_MagickSystem.uasset | 3 +++ .../Magick_System/DT_SpellList.uasset | 3 +++ .../Magick_System/DT_Spells.uasset | 3 +++ .../MAIN_CONTENT/Magick_System/Magick.uasset | 3 +++ .../Magick_System/S_MagickSpell.uasset | 3 +++ .../Magick_System/Spells/BP_.uasset | 3 +++ .../Magick_System/Spells/GBP_.uasset | 3 +++ .../Spells/GBP_PhenixFlame.uasset | 3 +++ .../Spells/NewGameplayAbilityBlueprint.uasset | 3 +++ .../Magick_System/UI/WB_Magick.uasset | 3 +++ .../Blueprints/BP_ThirdPersonCharacter.uasset | 4 ++-- .../Input/Actions/IA_MagickMenu.uasset | 3 +++ .../ThirdPerson/Input/IMC_Default.uasset | 4 ++-- .../9/U7/H8YL2PPHZPBTI74SUD0RNL.uasset | Bin 4083 -> 129 bytes 23 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/BPC_MagickSystem.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_SpellList.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_Spells.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Magick.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/S_MagickSpell.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/BP_.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/NewGameplayAbilityBlueprint.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset create mode 100644 Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_MagickMenu.uasset diff --git a/Elistria_Calling/Config/DefaultEngine.ini b/Elistria_Calling/Config/DefaultEngine.ini index 72733b4..99be106 100644 --- a/Elistria_Calling/Config/DefaultEngine.ini +++ b/Elistria_Calling/Config/DefaultEngine.ini @@ -147,3 +147,20 @@ ManualIPAddress= [/Script/Water.WaterRuntimeSettings] CollisionChannelForWaterTraces=ECC_WorldDynamic +[/Script/ConcertClient.ConcertClientConfig] +bIsHeadless=False +bInstallEditorToolbarButton=True +bAutoConnect=False +bRetryAutoConnectOnError=False +ServerType=Slate +DefaultServerURL= +DefaultSessionName= +DefaultSessionToRestore= +DefaultSaveSessionAs= +ReadOnlyAssignment=(GameplayTags=) +SendOnlyAssignment=(GameplayTags=) +bShouldPromptForHotReloadOnLevel=False +ClientSettings=(DisplayName="",AvatarColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),DesktopAvatarActorClass="/ConcertSyncClient/DesktopPresence.DesktopPresence_C",VRAvatarActorClass="/ConcertSyncClient/VRPresence.VRPresence_C",ServerPort=0,DiscoveryTimeoutSeconds=5,SessionTickFrequencySeconds=1,LatencyCompensationMs=0.000000,bReflectLevelEditorInGame=False,bSupportMixedBuildTypes=False,Tags=,ClientAuthenticationKey="") +SourceControlSettings=(ValidationMode=Soft) +EndpointSettings=(bEnableLogging=False,PurgeProcessedMessageDelaySeconds=30,RemoteEndpointTimeoutSeconds=60) + diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset index c2c8e9d..4bdb328 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b08a87918f47e08831794dd6d5eaacf8d98472e05a23994cb5735446b63f22e -size 524140 +oid sha256:b705ff69ba0538245d7490a5ebc51f3c343aeaac811166db53f320f47192407c +size 522628 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset index 9e56530..751d93f 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:feba551fd077937c51aaf9215ed5885933b8658662db0c710cf4ba924c662175 -size 399441 +oid sha256:5267d1283afc8c24d984d7aa7b4fc9ba9876fdf92a86b2af774e7aea53523cef +size 628427 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset index ebcbf6c..b61ce3d 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ac891075bcd07258fa49672b5b0c107c19c4fe98b2ebf94f8d57d4b688bacf7 -size 25350 +oid sha256:307183ef9f7856224a958811282425954f15c24b756afaa000c6d228f39835c6 +size 26295 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset index ea9f9a2..0f9f3a4 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:780c412f922b58cc72728a92dd394d90169b91636b3824149e7f144ce69f62c0 -size 352198 +oid sha256:ef1198d12ae12a44ae330d19d6c681c07ac61c37d1d4e32ae5643cfd061f6540 +size 344882 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_RecipeSlot.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_RecipeSlot.uasset index 24a82be..5849f6a 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_RecipeSlot.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_RecipeSlot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e661218759e644ab853d2b95b2e8ccb9984ac842151d2eb6d57abf9ee1aba47 -size 103570 +oid sha256:64b5c5e03e249bdea4e62d4f18dc97070f397ffaed90e6084556267f8d8e1572 +size 102512 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset index 1f9bbbc..5988291 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/BPC_EquipmentSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15f0d83bcb53f6674ec3613ce10c9fce449de5d321e88934caed0b25f106d335 -size 205854 +oid sha256:f0c76d16fc3bb6f18f4a286541031cac202cfcf0700eb2280c164566d6005d77 +size 126883 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/UI/WB_Equipment.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/UI/WB_Equipment.uasset index 54ae610..5343d9e 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/UI/WB_Equipment.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Equipment_System/UI/WB_Equipment.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22dfcbb926d826d25214bd154cc54787519717ef4bcebfe88d7256957af603ef -size 262156 +oid sha256:b25d672147fabde7b600b9a3f17861de67a1276b7314149ba13d50e36aaf8f4b +size 261649 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap index 0228767..1b72f92 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap +++ b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5c610f61b134a8292ca20bfce63d2327f12604f519a4a4d54bf334d2676b353 -size 94506 +oid sha256:7f7c5edcf5caafcd670191c9b91495505d1d9b163dfbec2a1634455217958483 +size 148184 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/BPC_MagickSystem.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/BPC_MagickSystem.uasset new file mode 100644 index 0000000..d5591fc --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/BPC_MagickSystem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c631b2a108ca80e41a1d62382c5d4c51ddc3fa0bcae525a8502f70f2dec61ce +size 6019 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_SpellList.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_SpellList.uasset new file mode 100644 index 0000000..c13fedf --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_SpellList.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb4929df5f19dc86e42aa15abeabc12da45a1262d75e1ffc950073e87d9b792d +size 1550 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_Spells.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_Spells.uasset new file mode 100644 index 0000000..ec63bbe --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_Spells.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:818b35ef4da177168a4f086dcae74d2a890c674f2749a90e252d525ef0b1d8e5 +size 40880 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Magick.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Magick.uasset new file mode 100644 index 0000000..7e4653a --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Magick.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ef9f44cad6ccc26e0f3d9b54f120ef717b86619d7ca2cc9899ffd0761b4d3d1 +size 1552 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/S_MagickSpell.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/S_MagickSpell.uasset new file mode 100644 index 0000000..7df7cfe --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/S_MagickSpell.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d473fb2ffe404f4aed648150d53844be95c8b0ea52388f4000b38e74463deaf +size 7959 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/BP_.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/BP_.uasset new file mode 100644 index 0000000..b45e53f --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/BP_.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2b52a6c03360a0e2806b03c4ac1328cf14d36868beaef06aabb629db8f1893f +size 2603 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset new file mode 100644 index 0000000..1f9d5e4 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8944532960cea73a970759d55aacfa8127673bb27ba465dcc95490de27178cf +size 2665 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset new file mode 100644 index 0000000..9c63385 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62027a5f6fe2d23fa6a9d5ddea05ee1e3768ac9283d9883b31b60205efd182d9 +size 16302 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/NewGameplayAbilityBlueprint.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/NewGameplayAbilityBlueprint.uasset new file mode 100644 index 0000000..9af4157 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/NewGameplayAbilityBlueprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9759c5c172e8e0b85df672bbfa4ef36e9696c497ad396e61393d03ac9d3707 +size 2786 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset new file mode 100644 index 0000000..a474998 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1879e3e8c86ea88d214e221acd03d2e01d87575c309fed5969932ffffb7e14a1 +size 375174 diff --git a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index b8bcfc0..eb2b95b 100644 --- a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b67b2301c2e058c32fe366dafc0ec81425634d49fdbb1b7d503e3f5504dbffe -size 1466763 +oid sha256:9c036e104dc65138ad0a395489484330c38ad21be9b7887303f936cf212bbaf7 +size 1436103 diff --git a/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_MagickMenu.uasset b/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_MagickMenu.uasset new file mode 100644 index 0000000..45c4b8c --- /dev/null +++ b/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_MagickMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ea27c35b205fb5751b6ac4e744d529bd6a1629071a342c6da918c39e2eead7e +size 1418 diff --git a/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset b/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset index d4c9129..56c6748 100644 --- a/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd1f92d777e7f72a6ee126c5423c68db6a76d71f8a3ee23553e98ab1f71f6397 -size 20993 +oid sha256:b5794727327d13effcf440efe752e7146f84bd499a9c2a2b213d4a256b14cc04 +size 21670 diff --git a/Elistria_Calling/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/9/U7/H8YL2PPHZPBTI74SUD0RNL.uasset b/Elistria_Calling/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/9/U7/H8YL2PPHZPBTI74SUD0RNL.uasset index 83a913f0881ce02d8b92f525f6c5a03c2e19e2da..46dc8a4f5ae44c1a0d65ebb24e70e4c7a746511a 100644 GIT binary patch literal 129 zcmWN?OA^8$3;@u5Pr(H&pN6FLHjscYqtX%V!qe;9yeq#)>n~O3JjbE+z0KRBjP-y0 zq?P+qk2ABr?9!X4QKR#CY)O3BV-U80*&`<7N{GZ@$PhXXj>Q=$g-Y27cb{1RB?b$U MB`l+TvjQMme!+w%g8%>k literal 4083 zcmb6cZEPG@@ue{k+9ptwFG|ujsnez;@$Kz>t^?G2dwb`#@6PA@OpL;IeY=UzKHna@ zYsU_al9mz~wf$i=v5sIKyQ&p`{KT=wX3!xay%o?wYU$1)V!uho)|M=^7SMCJbJue?D zKg0L_j?Q2;FMm~NM|P@NIbKQ5S-v+;3u+vKP&hH zUXFGYdr6pZN=RdeRHYfs*aUf7C+^e2PY!$7K9^*N894|dlB zKfU~yE782(fg!ClC&Rz`+`AZn-Z9NE%Bq%BEX^n@6_dPi=G9+p1WsBh4J-S!gkDlA z^4&ydQniH@7P2Bv&dAukXJ*KHq#Zr2-38MXB z_~+~A2}rP%VHGsPMC;bR%^k*QWi6u~t)1tLHVhEZMjHaekRQ$9i7G(Ubb~yxp+(KZ z&=ZFkcw|`|hj>+$ioK<#EPHZ;WkXHFI(pTURBC1;0mdHAlMi{i!n+e}I^ETuj^w0} zKbwy-nN)&stJv>%)RiZ+F|7jTS-Le*D_8e{I(Kh8NlB&*Ee_iz=k!`sF@{Ox_@U*u zT}1;#Rx>@>q%4dMXhb>9{B%xw5z9%-S3(`QBc5!@DAz2Hpc`7=Nhfki+VM3E9_5ME zePuZ9M>@YFeHzF@MKMic?H`}QZHsDqmC=eN%X52chmRcUym<)4ZO_Tj_Nk*NPTiKO zrlnL%nxNYqi?r-)eHKrCQnM7?dGglb=O40XTq!&o9?z_S8bWiLnDNOqn5Axx*A*Sx zenPY9m@lRUDe9PX@S4rP#rZUV4^Ou}k8%qgxqJDZ->jKOuO}}vxv|rhap7R;2`o5 z=-ce}o5^97K==gYZg#r!^ilh6ae0U^ItY#Wn#rwo#1@rXw?sL*#$xNz7&OXJ+Ddn= ze}TWZHd&X-(LKQZ_|jG6=pIai+?K1z-R|=6(!Z^V9FS*SvW@V5MS!;f;q9Jt8M|GA z*CDpWV4+@=|8K)uGtft0F)nyIK7xku9+vbaK%*Va*7{GwTIdUn(F)Q+THQy_Ygo>g z0FC}OTMJd7O3Zom3;Qk5aBuz&?PF;Fh6W^Z-1QH2?tYQs@?@F!=)I(VFIzU_74lYxKee?FW{vmChtyaFE}} z^Ssnm*jpSi`tqKUP%PH-&2pKwLjDkN_`XVTfED{wW7({3M0!LmqYnEfM4N@5ye~7T z#w$a)V&Q-y#)i~5H^HZOnf?80Wq)B%GHbiM3jAT^8 z(d8gX9(~m6?#ULU;e4`JRhd%np#D`mj1X)a8jA=LFk##$>(U;F1NC%6I}nz< z%)NI$_MUXdmaZvb)#z&*I&NGTBD&0FPT>KhPT=Dfq3#SCi&rZGHF%nO@F8@vIX))| zNio|cvwkk@i;7{!=ZpB^KSwwc3Wi%LfISWy3xn8{tKUW&P18%lSnX#^F#j z?Bo35Sl_6k8qRAqqp9#_gqNjUVB1)Yk^LOw_4@yRf&j=L33GsWmPcYB9At$U z?`4EYSQdIy*<6N~Qesq26a|@M=0SMg2nPa~9A!hI!1Ka`hQi+Z z1lpsRGU%9MN~f68UF@fHiYXt)5Wg6buY~O>0sG7N#b7Kb25}@f6rY1Go9&VT`5V?^ z7@qO7_>U2O3qVd}nPe(^zy(Im78CvUb%e=)*9HP!PY5)v?4yYF9RHRf&;+LM1gxW1 ihV;=+o0&f0U>MLl@BdRowz>*dP(_^!PsBO+yZ=AlqHoCn From 5667716afba584a9ae5e72a4292dd36cd75e4553 Mon Sep 17 00:00:00 2001 From: Lincoln Whyte <10820584@uvu.edu> Date: Wed, 24 Sep 2025 00:54:06 -0600 Subject: [PATCH 18/33] Cliff pieces & rocks + UVs --- Raw Content/Models/cliffs/SM_cliff1.fbx | 3 +++ Raw Content/Models/cliffs/SM_cliff2.fbx | 3 +++ Raw Content/Models/cliffs/SM_cliff3.fbx | 3 +++ Raw Content/Models/cliffs/SM_cliff4.fbx | 3 +++ Raw Content/Models/cliffs/SM_cliff5.fbx | 3 +++ Raw Content/Models/cliffs/SM_cliff6.fbx | 3 +++ Raw Content/Models/cliffs/SM_cliff7.fbx | 3 +++ Raw Content/Models/cliffs/SM_cliff8.fbx | 3 +++ Raw Content/Models/cliffs/SM_cliff9.fbx | 3 +++ Raw Content/Models/rocks/SM_rock3.fbx | 3 +++ Raw Content/Models/rocks/SM_rock4.fbx | 3 +++ Raw Content/Models/rocks/SM_rock5.fbx | 3 +++ Raw Content/Models/rocks/SM_rock6.fbx | 3 +++ Raw Content/Models/rocks/SM_rock7.fbx | 3 +++ 14 files changed, 42 insertions(+) create mode 100644 Raw Content/Models/cliffs/SM_cliff1.fbx create mode 100644 Raw Content/Models/cliffs/SM_cliff2.fbx create mode 100644 Raw Content/Models/cliffs/SM_cliff3.fbx create mode 100644 Raw Content/Models/cliffs/SM_cliff4.fbx create mode 100644 Raw Content/Models/cliffs/SM_cliff5.fbx create mode 100644 Raw Content/Models/cliffs/SM_cliff6.fbx create mode 100644 Raw Content/Models/cliffs/SM_cliff7.fbx create mode 100644 Raw Content/Models/cliffs/SM_cliff8.fbx create mode 100644 Raw Content/Models/cliffs/SM_cliff9.fbx create mode 100644 Raw Content/Models/rocks/SM_rock3.fbx create mode 100644 Raw Content/Models/rocks/SM_rock4.fbx create mode 100644 Raw Content/Models/rocks/SM_rock5.fbx create mode 100644 Raw Content/Models/rocks/SM_rock6.fbx create mode 100644 Raw Content/Models/rocks/SM_rock7.fbx diff --git a/Raw Content/Models/cliffs/SM_cliff1.fbx b/Raw Content/Models/cliffs/SM_cliff1.fbx new file mode 100644 index 0000000..f6eca19 --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c87f9c0a602de33b4084569f57a57a00bd820280496c7cdca8041c4a2bb76d22 +size 269312 diff --git a/Raw Content/Models/cliffs/SM_cliff2.fbx b/Raw Content/Models/cliffs/SM_cliff2.fbx new file mode 100644 index 0000000..8a13771 --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32446516717ef06591960bef87e5d5311427ce025f610f8704e633a7ecbd1d75 +size 257504 diff --git a/Raw Content/Models/cliffs/SM_cliff3.fbx b/Raw Content/Models/cliffs/SM_cliff3.fbx new file mode 100644 index 0000000..d8f9fc2 --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46ff9951aa7fee8943f3ef954e7d5f32b565441700ea7096da68011544764ae8 +size 251072 diff --git a/Raw Content/Models/cliffs/SM_cliff4.fbx b/Raw Content/Models/cliffs/SM_cliff4.fbx new file mode 100644 index 0000000..40d56f5 --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff4.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df615531e29e826ef75d00fe6a648edb65e746a85ffd5a8f9f2bdd13089088f2 +size 286288 diff --git a/Raw Content/Models/cliffs/SM_cliff5.fbx b/Raw Content/Models/cliffs/SM_cliff5.fbx new file mode 100644 index 0000000..3985a5d --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff5.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:684d8d91f154ccfed3f8dfe5ee2df6dc359d40a2a572d73ff3e508df90ebcdb4 +size 264208 diff --git a/Raw Content/Models/cliffs/SM_cliff6.fbx b/Raw Content/Models/cliffs/SM_cliff6.fbx new file mode 100644 index 0000000..5d2ebb0 --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff6.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac271236c853ee53e205014e37b2c3b11b00c1d79cf1ef363488f7aec1b7d88c +size 274800 diff --git a/Raw Content/Models/cliffs/SM_cliff7.fbx b/Raw Content/Models/cliffs/SM_cliff7.fbx new file mode 100644 index 0000000..bab7c0c --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff7.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7858f2bba19641c6c85d1fdada94f8bb91ae5d6775fa64de8456d3c73c727b18 +size 267216 diff --git a/Raw Content/Models/cliffs/SM_cliff8.fbx b/Raw Content/Models/cliffs/SM_cliff8.fbx new file mode 100644 index 0000000..fa1e23e --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff8.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b689643fb8a259f24829569262828076f4adb2a07651a3eb129f6da4d3dce607 +size 250352 diff --git a/Raw Content/Models/cliffs/SM_cliff9.fbx b/Raw Content/Models/cliffs/SM_cliff9.fbx new file mode 100644 index 0000000..db512cc --- /dev/null +++ b/Raw Content/Models/cliffs/SM_cliff9.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75296822a8f9dfd77bafa7765a1e1dc1ceb2a04d331571514a5f7c03fa869f3c +size 259104 diff --git a/Raw Content/Models/rocks/SM_rock3.fbx b/Raw Content/Models/rocks/SM_rock3.fbx new file mode 100644 index 0000000..41e6f96 --- /dev/null +++ b/Raw Content/Models/rocks/SM_rock3.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1c366316e0ff6634e10c53b85edf23753d1528c8d32d56c439bf923c5287308 +size 46224 diff --git a/Raw Content/Models/rocks/SM_rock4.fbx b/Raw Content/Models/rocks/SM_rock4.fbx new file mode 100644 index 0000000..12123ed --- /dev/null +++ b/Raw Content/Models/rocks/SM_rock4.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5c8873d9edeaf8ce9c7f271923b0e510732d19fb928c6530789193c4dad3e57 +size 267984 diff --git a/Raw Content/Models/rocks/SM_rock5.fbx b/Raw Content/Models/rocks/SM_rock5.fbx new file mode 100644 index 0000000..f2a0217 --- /dev/null +++ b/Raw Content/Models/rocks/SM_rock5.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6dfe345363bc5bb6d1e4408ad829d88b87135783f72738c404e8bf76b3822f4 +size 166976 diff --git a/Raw Content/Models/rocks/SM_rock6.fbx b/Raw Content/Models/rocks/SM_rock6.fbx new file mode 100644 index 0000000..f104ef1 --- /dev/null +++ b/Raw Content/Models/rocks/SM_rock6.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba6d3960b6760085495128205f76996d2d138f0cb0776c3f2a7f57a30a29f06c +size 38912 diff --git a/Raw Content/Models/rocks/SM_rock7.fbx b/Raw Content/Models/rocks/SM_rock7.fbx new file mode 100644 index 0000000..6bb809e --- /dev/null +++ b/Raw Content/Models/rocks/SM_rock7.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c26a2578655c11635ce52b9db3906981beb1c64eb1ed9ab49f045325891c261 +size 63056 From e7e467e5fbcfd8ffdd4794623dc62e3635764007 Mon Sep 17 00:00:00 2001 From: "Mason S." <10767492@uvu.edu> Date: Wed, 24 Sep 2025 14:20:57 -0600 Subject: [PATCH 19/33] Dagger01 and Dagger02 with UV's done --- Raw Content/Models/Weapons/SM_Weapon_Dagger01.fbx | 3 +++ Raw Content/Models/Weapons/SM_Weapon_Dagger02.fbx | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 Raw Content/Models/Weapons/SM_Weapon_Dagger01.fbx create mode 100644 Raw Content/Models/Weapons/SM_Weapon_Dagger02.fbx diff --git a/Raw Content/Models/Weapons/SM_Weapon_Dagger01.fbx b/Raw Content/Models/Weapons/SM_Weapon_Dagger01.fbx new file mode 100644 index 0000000..5a9fd49 --- /dev/null +++ b/Raw Content/Models/Weapons/SM_Weapon_Dagger01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecaff198859df1e4c07cec4817442026df9e6a4f3841bfdfe35a0fefd33480f2 +size 49712 diff --git a/Raw Content/Models/Weapons/SM_Weapon_Dagger02.fbx b/Raw Content/Models/Weapons/SM_Weapon_Dagger02.fbx new file mode 100644 index 0000000..1614726 --- /dev/null +++ b/Raw Content/Models/Weapons/SM_Weapon_Dagger02.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bb5fd75469cadb7dd0ff342f4d957c86b2e9609560184beb9c8e61ae8f1a417 +size 51376 From 6da5d7f1fb35e03c079bef2829b874cbea9af35a Mon Sep 17 00:00:00 2001 From: Lily Wilson Date: Thu, 25 Sep 2025 14:57:17 -0600 Subject: [PATCH 20/33] Magick System Update 01 --- .../Magick_System/Spell_Effects/PhoenixFire_Volley.uasset | 3 +++ .../Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset | 4 ++-- .../MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset | 3 --- .../MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset | 3 +++ .../Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spell_Effects/PhoenixFire_Volley.uasset delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spell_Effects/PhoenixFire_Volley.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spell_Effects/PhoenixFire_Volley.uasset new file mode 100644 index 0000000..a710bc3 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spell_Effects/PhoenixFire_Volley.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3334555f4c342bf5d84b92d62d9a329f2d424c00d485b8526c4adaf8fe7ff8c6 +size 30470 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset index 1f9d5e4..9aed057 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f8944532960cea73a970759d55aacfa8127673bb27ba465dcc95490de27178cf -size 2665 +oid sha256:64c2c8431ed7593c25dc9e572f2f4d143b3b9fed07a8023bfc2582c32d864611 +size 2677 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset deleted file mode 100644 index 9c63385..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhenixFlame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62027a5f6fe2d23fa6a9d5ddea05ee1e3768ac9283d9883b31b60205efd182d9 -size 16302 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset new file mode 100644 index 0000000..395d3b1 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd55a1aca6c53f26e20287e4e9202d55be42709b151e74239c17eaf44216a4a1 +size 34669 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset index a474998..998b928 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1879e3e8c86ea88d214e221acd03d2e01d87575c309fed5969932ffffb7e14a1 -size 375174 +oid sha256:755f7b1d4eba0e5aae89cff67da06da147df4ea0c101fbab95716b224253f114 +size 372409 From 055cb0a45f4fb9b60d66fee2a816bbe963ba22fa Mon Sep 17 00:00:00 2001 From: "Mason S." <10767492@uvu.edu> Date: Thu, 25 Sep 2025 16:44:49 -0600 Subject: [PATCH 21/33] Added Greatswords and Scythe to weapons folder --- Raw Content/Models/Weapons/SM_Weapon_Scythe.fbx | 3 +++ Raw Content/Models/Weapons/SM_Weapon_SwordGreat01.fbx | 3 +++ Raw Content/Models/Weapons/SM_Weapon_SwordGreat02.fbx | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 Raw Content/Models/Weapons/SM_Weapon_Scythe.fbx create mode 100644 Raw Content/Models/Weapons/SM_Weapon_SwordGreat01.fbx create mode 100644 Raw Content/Models/Weapons/SM_Weapon_SwordGreat02.fbx diff --git a/Raw Content/Models/Weapons/SM_Weapon_Scythe.fbx b/Raw Content/Models/Weapons/SM_Weapon_Scythe.fbx new file mode 100644 index 0000000..2fa87e5 --- /dev/null +++ b/Raw Content/Models/Weapons/SM_Weapon_Scythe.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b67cfedd98210a3bac165d2432827bf12e84c875678bce1065e188ab5b65d187 +size 88832 diff --git a/Raw Content/Models/Weapons/SM_Weapon_SwordGreat01.fbx b/Raw Content/Models/Weapons/SM_Weapon_SwordGreat01.fbx new file mode 100644 index 0000000..9598ccf --- /dev/null +++ b/Raw Content/Models/Weapons/SM_Weapon_SwordGreat01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1be6590f61cd5a3c291cff43f30efac304cc3e85ae01a4ce14736b4e32f588da +size 62992 diff --git a/Raw Content/Models/Weapons/SM_Weapon_SwordGreat02.fbx b/Raw Content/Models/Weapons/SM_Weapon_SwordGreat02.fbx new file mode 100644 index 0000000..ce5c921 --- /dev/null +++ b/Raw Content/Models/Weapons/SM_Weapon_SwordGreat02.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:787131b74b5febea618037c99ddd47f8b90580ff1544d095357ad6d025f488ba +size 90768 From 0a112ed976492751e023fca176600d016975dbd6 Mon Sep 17 00:00:00 2001 From: Lily Wilson Date: Fri, 26 Sep 2025 05:40:08 -0600 Subject: [PATCH 22/33] Magick System Update 02 --- .../Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset | 3 +++ .../Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset | 3 +++ .../Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset new file mode 100644 index 0000000..6dcbad1 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebc8cd8459d195ea6f642e3752cff487b8d869446347a747fd1c2dc060034b37 +size 2280417 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset new file mode 100644 index 0000000..a155e5d --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcc43adbbd9f060dbbefb23d4c880c3af89b00a26e8adeb94b0fcdc7aece74ab +size 2617921 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset index 998b928..d428efd 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:755f7b1d4eba0e5aae89cff67da06da147df4ea0c101fbab95716b224253f114 -size 372409 +oid sha256:ddbc8df6c218d05dc6385b5d8de859114fb81e27043cc7a333e5fec7a5fbdd5b +size 398292 From dc2c5af68a027f4f975cfda0d606149058f23742 Mon Sep 17 00:00:00 2001 From: Nyx Date: Fri, 26 Sep 2025 17:50:32 -0600 Subject: [PATCH 23/33] magic update #2 --- Elistria_Calling/.vsconfig | 13 ++++ .../DefaultEditorPerProjectUserSettings.ini | 9 ++- Elistria_Calling/Config/DefaultEngine.ini | 3 + Elistria_Calling/Config/Tags/Spells.ini | 38 ++++++++++++ .../Blueprints/BPI_PlayerControlled.uasset | 4 +- .../BP_MagickPlayerController.uasset | 3 + .../Blueprints/BP_MagickPlayerState.uasset | 3 + .../Blueprints/BP_PlayerController.uasset | 4 +- .../Blueprints/BP_PlayerState.uasset | 3 - .../Crafting_System/UI/WB_CraftMenuUI.uasset | 4 +- .../Magick_System/DT_Spells.uasset | 2 +- .../Spells/GA_PhoenixFlame.uasset | 3 + .../Spells/GBP_PhoenixFlame.uasset | 4 +- .../Architecture/Floor_400x400.uasset | 2 +- .../Blueprints/BP_ThirdPersonCharacter.uasset | 4 +- .../Blueprints/BP_ThirdPersonGameMode.uasset | 4 +- .../Input/Actions/IA_UseAbility.uasset | 3 + .../ThirdPerson/Input/IMC_Default.uasset | 4 +- Elistria_Calling/Elistria_Calling.uproject | 33 +++++++++++ .../Source/Elistria_Calling.Target.cs | 15 +++++ .../Elistria_Calling.Build.cs | 23 ++++++++ .../Elistria_Calling/Elistria_Calling.cpp | 6 ++ .../Elistria_Calling/Elistria_Calling.h | 6 ++ .../ElistriaAbilitySystemComponent.cpp | 5 ++ .../Private/HealthAttributeSet.cpp | 5 ++ .../Private/MagickPlayerController.cpp | 17 ++++++ .../Private/MagickPlayerState.cpp | 59 +++++++++++++++++++ .../Private/ManaAttributeSet.cpp | 34 +++++++++++ .../Public/ElistriaAbilitySystemComponent.h | 17 ++++++ .../Public/HealthAttributeSet.h | 17 ++++++ .../Public/MagickPlayerController.h | 19 ++++++ .../Public/MagickPlayerState.h | 36 +++++++++++ .../Public/ManaAttributeSet.h | 52 ++++++++++++++++ .../Source/Elistria_CallingEditor.Target.cs | 15 +++++ 34 files changed, 449 insertions(+), 20 deletions(-) create mode 100644 Elistria_Calling/.vsconfig create mode 100644 Elistria_Calling/Config/Tags/Spells.ini create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerController.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset create mode 100644 Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_UseAbility.uasset create mode 100644 Elistria_Calling/Source/Elistria_Calling.Target.cs create mode 100644 Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.Build.cs create mode 100644 Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.cpp create mode 100644 Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.h create mode 100644 Elistria_Calling/Source/Elistria_Calling/Private/ElistriaAbilitySystemComponent.cpp create mode 100644 Elistria_Calling/Source/Elistria_Calling/Private/HealthAttributeSet.cpp create mode 100644 Elistria_Calling/Source/Elistria_Calling/Private/MagickPlayerController.cpp create mode 100644 Elistria_Calling/Source/Elistria_Calling/Private/MagickPlayerState.cpp create mode 100644 Elistria_Calling/Source/Elistria_Calling/Private/ManaAttributeSet.cpp create mode 100644 Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAbilitySystemComponent.h create mode 100644 Elistria_Calling/Source/Elistria_Calling/Public/HealthAttributeSet.h create mode 100644 Elistria_Calling/Source/Elistria_Calling/Public/MagickPlayerController.h create mode 100644 Elistria_Calling/Source/Elistria_Calling/Public/MagickPlayerState.h create mode 100644 Elistria_Calling/Source/Elistria_Calling/Public/ManaAttributeSet.h create mode 100644 Elistria_Calling/Source/Elistria_CallingEditor.Target.cs diff --git a/Elistria_Calling/.vsconfig b/Elistria_Calling/.vsconfig new file mode 100644 index 0000000..7f5f4b3 --- /dev/null +++ b/Elistria_Calling/.vsconfig @@ -0,0 +1,13 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.Windows10SDK.22621", + "Microsoft.VisualStudio.Workload.CoreEditor", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.NativeDesktop", + "Microsoft.VisualStudio.Workload.NativeGame" + ] +} diff --git a/Elistria_Calling/Config/DefaultEditorPerProjectUserSettings.ini b/Elistria_Calling/Config/DefaultEditorPerProjectUserSettings.ini index d3d6cc0..4ad49ba 100644 --- a/Elistria_Calling/Config/DefaultEditorPerProjectUserSettings.ini +++ b/Elistria_Calling/Config/DefaultEditorPerProjectUserSettings.ini @@ -1,2 +1,9 @@ [ContentBrowser] -ContentBrowserTab1.SelectedPaths=/Game/ThirdPersonBP \ No newline at end of file +ContentBrowserTab1.SelectedPaths=/Game/ThirdPersonBP + +[/Script/GameplayDebugger.GameplayDebuggerUserSettings] +bEnableGameplayDebuggerInEditor=True +MaxViewDistance=25000.000000 +MaxViewAngle=45.000000 +FontSize=10 + diff --git a/Elistria_Calling/Config/DefaultEngine.ini b/Elistria_Calling/Config/DefaultEngine.ini index 99be106..701ddd9 100644 --- a/Elistria_Calling/Config/DefaultEngine.ini +++ b/Elistria_Calling/Config/DefaultEngine.ini @@ -164,3 +164,6 @@ ClientSettings=(DisplayName="",AvatarColor=(R=1.000000,G=1.000000,B=1.000000,A=1 SourceControlSettings=(ValidationMode=Soft) EndpointSettings=(bEnableLogging=False,PurgeProcessedMessageDelaySeconds=30,RemoteEndpointTimeoutSeconds=60) + +[CoreRedirects] ++ClassRedirects=(OldName="/Script/Elistria_Calling.MagickPlayerState",NewName="/Script/Elistria_Calling.MagickPlayerState") \ No newline at end of file diff --git a/Elistria_Calling/Config/Tags/Spells.ini b/Elistria_Calling/Config/Tags/Spells.ini new file mode 100644 index 0000000..7589249 --- /dev/null +++ b/Elistria_Calling/Config/Tags/Spells.ini @@ -0,0 +1,38 @@ +[/Script/GameplayTags.GameplayTagsList] +GameplayTagList=(Tag="Spell.Chaos.Air.BuffetingWinds",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Air.GaleThrust",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Air.Suffocate",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Lightning.FieldOfLightning",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Lightning.Squall",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Lightning.ThunderStrikes",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Water.CleansingWave",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Water.CurrentBash",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Water.Tsunami",DevComment="") +GameplayTagList=(Tag="Spell.Death.Darkness.Oblivion",DevComment="") +GameplayTagList=(Tag="Spell.Death.Darkness.StolenSight",DevComment="") +GameplayTagList=(Tag="Spell.Death.Darkness.TurnToShadow",DevComment="") +GameplayTagList=(Tag="Spell.Death.Ice.FallenFrost",DevComment="") +GameplayTagList=(Tag="Spell.Death.Ice.PillarsOfIce",DevComment="") +GameplayTagList=(Tag="Spell.Death.Ice.Winter",DevComment="") +GameplayTagList=(Tag="Spell.Death.Necromancy.Apocalypse",DevComment="") +GameplayTagList=(Tag="Spell.Death.Necromancy.RaiseTheDead",DevComment="") +GameplayTagList=(Tag="Spell.Death.Necromancy.VitalityDrain",DevComment="") +GameplayTagList=(Tag="Spell.Life.Blood.Annihilate",DevComment="") +GameplayTagList=(Tag="Spell.Life.Blood.BleedingWounds",DevComment="") +GameplayTagList=(Tag="Spell.Life.Blood.BloodCage",DevComment="") +GameplayTagList=(Tag="Spell.Life.Earth.Entomb",DevComment="") +GameplayTagList=(Tag="Spell.Life.Earth.SplitTheEarth",DevComment="") +GameplayTagList=(Tag="Spell.Life.Earth.StoneShield",DevComment="") +GameplayTagList=(Tag="Spell.Life.Healing.GiveLife",DevComment="") +GameplayTagList=(Tag="Spell.Life.Healing.RestoringTouch",DevComment="") +GameplayTagList=(Tag="Spell.Life.Healing.Sanctuary",DevComment="") +GameplayTagList=(Tag="Spell.Light.Fire.FireLights",DevComment="") +GameplayTagList=(Tag="Spell.Light.Fire.Meteor",DevComment="") +GameplayTagList=(Tag="Spell.Light.Fire.PheonixFire",DevComment="") +GameplayTagList=(Tag="Spell.Light.Solar.Radiance",DevComment="") +GameplayTagList=(Tag="Spell.Light.Solar.SearingRay",DevComment="") +GameplayTagList=(Tag="Spell.Light.Solar.ShieldOfTheSun",DevComment="") +GameplayTagList=(Tag="Spell.Light.Starlight.Constellation",DevComment="") +GameplayTagList=(Tag="Spell.Light.Starlight.SongOfFallingStars",DevComment="") +GameplayTagList=(Tag="Spell.Light.Starlight.StarGuide",DevComment="") + diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset index 5cf5194..3da6238 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPI_PlayerControlled.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c25f45a6f638c297198aa17a7a3cfdcb8b94c071ad29b6f88eb005b4311e4fd -size 49543 +oid sha256:82a17e362d9ae552ccd85350d58dba4d49dde4fe843c5205ce62fcd7042c0754 +size 51458 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerController.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerController.uasset new file mode 100644 index 0000000..8dd614b --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerController.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64b8cb2d0256d3c6932480de5d06f2a5db803cb779fbd761955166227c217ecc +size 20676 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset new file mode 100644 index 0000000..3d21d72 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81377c0fea41cf55adfa56c15334ed44fdfce9553cda02e22d17e66747780904 +size 40510 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset index 751d93f..3056b9e 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5267d1283afc8c24d984d7aa7b4fc9ba9876fdf92a86b2af774e7aea53523cef -size 628427 +oid sha256:29d64571f6460819033c27ed73cb7ae0fc341533414a45bc7eca96719146263d +size 631354 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset deleted file mode 100644 index b61ce3d..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerState.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:307183ef9f7856224a958811282425954f15c24b756afaa000c6d228f39835c6 -size 26295 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset index 0f9f3a4..e6ee943 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Crafting_System/UI/WB_CraftMenuUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef1198d12ae12a44ae330d19d6c681c07ac61c37d1d4e32ae5643cfd061f6540 -size 344882 +oid sha256:9b5c9bd9d2c553f59efea93210aa16b41d3ce0c29edd86751f8f25a228bccaf0 +size 338962 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_Spells.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_Spells.uasset index ec63bbe..4e49b30 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_Spells.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/DT_Spells.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:818b35ef4da177168a4f086dcae74d2a890c674f2749a90e252d525ef0b1d8e5 +oid sha256:88c3286646c33346cf72c552553c41dadf5bd1284d83ecc8b38b1fd875c0dcf1 size 40880 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset new file mode 100644 index 0000000..59828c0 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5249343c265ad7efaa6e7cb054dd89c25747e7eb106419ca4f9153619d15003b +size 54769 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset index 395d3b1..6bbef19 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd55a1aca6c53f26e20287e4e9202d55be42709b151e74239c17eaf44216a4a1 -size 34669 +oid sha256:b9fbf1ee3289dc7711445f470ef96ef38ee070f70a4794129a5ef6846d026c7d +size 2797 diff --git a/Elistria_Calling/Content/StarterContent/Architecture/Floor_400x400.uasset b/Elistria_Calling/Content/StarterContent/Architecture/Floor_400x400.uasset index da99644..3f00340 100644 --- a/Elistria_Calling/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/Elistria_Calling/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea2a6797840f1630482ad1e9bf7b0619da5beaff02c8b610389814633efc99d9 +oid sha256:c6d2d79168f442b1b8573130dc5d76681167a55a3ea1af46db55cf9d02228312 size 15406 diff --git a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index eb2b95b..d835c03 100644 --- a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c036e104dc65138ad0a395489484330c38ad21be9b7887303f936cf212bbaf7 -size 1436103 +oid sha256:14804ce910d3731bbc91645873e604e45005f987cd44007849e7fa0ae2e8711c +size 1463008 diff --git a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset index 54880d0..600380a 100644 --- a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c1deaabeb77c4f376b5ffffb7ab04959dc338fb476cfd2b7fac1bfc3a5f2926 -size 16340 +oid sha256:2e09136c73a260a5fbc18eff76c18cf5b8ce6056f3cf5e8456b0d7036f3a3c20 +size 16586 diff --git a/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_UseAbility.uasset b/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_UseAbility.uasset new file mode 100644 index 0000000..43bf4c9 --- /dev/null +++ b/Elistria_Calling/Content/ThirdPerson/Input/Actions/IA_UseAbility.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a7e91764960d799d82dcabcb7f85595443504b5d9079f00889d17bd8b25f3dc +size 1418 diff --git a/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset b/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset index 56c6748..a592304 100644 --- a/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Input/IMC_Default.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5794727327d13effcf440efe752e7146f84bd499a9c2a2b213d4a256b14cc04 -size 21670 +oid sha256:102b39983335d985bb26c123ad8654d8a7cefc1888daabc52fd3b6660f97ab2f +size 22355 diff --git a/Elistria_Calling/Elistria_Calling.uproject b/Elistria_Calling/Elistria_Calling.uproject index b590f8f..d9417c2 100644 --- a/Elistria_Calling/Elistria_Calling.uproject +++ b/Elistria_Calling/Elistria_Calling.uproject @@ -3,6 +3,17 @@ "EngineAssociation": "5.4", "Category": "", "Description": "", + "Modules": [ + { + "Name": "Elistria_Calling", + "Type": "Runtime", + "LoadingPhase": "Default", + "AdditionalDependencies": [ + "GameplayAbilities", + "Engine" + ] + } + ], "Plugins": [ { "Name": "ModelingToolsEditorMode", @@ -289,6 +300,28 @@ { "Name": "PerforceSourceControl", "Enabled": false + }, + { + "Name": "Buoyancy", + "Enabled": true + }, + { + "Name": "Volumetrics", + "Enabled": true + }, + { + "Name": "VirtualHeightfieldMesh", + "Enabled": true + }, + { + "Name": "SteamSockets", + "Enabled": true } + ], + "TargetPlatforms": [ + "Linux", + "LinuxArm64", + "Windows", + "Mac" ] } \ No newline at end of file diff --git a/Elistria_Calling/Source/Elistria_Calling.Target.cs b/Elistria_Calling/Source/Elistria_Calling.Target.cs new file mode 100644 index 0000000..750c006 --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling.Target.cs @@ -0,0 +1,15 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +using UnrealBuildTool; +using System.Collections.Generic; + +public class Elistria_CallingTarget : TargetRules +{ + public Elistria_CallingTarget(TargetInfo Target) : base(Target) + { + Type = TargetType.Game; + DefaultBuildSettings = BuildSettingsVersion.V5; + + ExtraModuleNames.AddRange( new string[] { "Elistria_Calling" } ); + } +} diff --git a/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.Build.cs b/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.Build.cs new file mode 100644 index 0000000..cbd6e72 --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.Build.cs @@ -0,0 +1,23 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +using UnrealBuildTool; + +public class Elistria_Calling : ModuleRules +{ + public Elistria_Calling(ReadOnlyTargetRules Target) : base(Target) + { + PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; + + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore","GameplayAbilities", "GameplayTags", "GameplayTasks" }); + + PrivateDependencyModuleNames.AddRange(new string[] { }); + + // Uncomment if you are using Slate UI + PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); + + // Uncomment if you are using online features + PrivateDependencyModuleNames.Add("OnlineSubsystem"); + + // To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true + } +} diff --git a/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.cpp b/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.cpp new file mode 100644 index 0000000..4f8148b --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.cpp @@ -0,0 +1,6 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "Elistria_Calling.h" +#include "Modules/ModuleManager.h" + +IMPLEMENT_PRIMARY_GAME_MODULE( FDefaultGameModuleImpl, Elistria_Calling, "Elistria_Calling" ); diff --git a/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.h b/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.h new file mode 100644 index 0000000..90aad9e --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Elistria_Calling.h @@ -0,0 +1,6 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" + diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/ElistriaAbilitySystemComponent.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/ElistriaAbilitySystemComponent.cpp new file mode 100644 index 0000000..5aaeef4 --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Private/ElistriaAbilitySystemComponent.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "ElistriaAbilitySystemComponent.h" + diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/HealthAttributeSet.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/HealthAttributeSet.cpp new file mode 100644 index 0000000..e2c623e --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Private/HealthAttributeSet.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "HealthAttributeSet.h" + diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/MagickPlayerController.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/MagickPlayerController.cpp new file mode 100644 index 0000000..343b571 --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Private/MagickPlayerController.cpp @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "MagickPlayerController.h" + +#include "MagickPlayerState.h" + +void AMagickPlayerController::OnPossess(APawn *InPawn) +{ + Super::OnPossess(InPawn); + UE_LOG(LogTemp, Display, TEXT("OnPossess")); + AMagickPlayerState* PS = GetPlayerState(); + if (PS) + { + PS->SetupAbilityActorInfo(); + } +} diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/MagickPlayerState.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/MagickPlayerState.cpp new file mode 100644 index 0000000..c394434 --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Private/MagickPlayerState.cpp @@ -0,0 +1,59 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "MagickPlayerState.h" + + + + +AMagickPlayerState::AMagickPlayerState() +{ + ElistriaAbilitySystemComponent = CreateDefaultSubobject(TEXT("AbilitySystem")); + ManaSet = CreateDefaultSubobject(TEXT("ManaSet")); +} + +UElistriaAbilitySystemComponent* AMagickPlayerState::GetAbilitySystemComponent() const +{ + return ElistriaAbilitySystemComponent; +} + +void AMagickPlayerState::BeginPlay() +{ + Super::BeginPlay(); + + +} + +void AMagickPlayerState::GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const +{ + Super::GetLifetimeReplicatedProps(OutLifetimeProps); + + DOREPLIFETIME_CONDITION_NOTIFY(AMagickPlayerState, ElistriaAbilitySystemComponent, COND_None, REPNOTIFY_Always); + DOREPLIFETIME_CONDITION_NOTIFY(AMagickPlayerState, ManaSet, COND_None, REPNOTIFY_Always); +} + +void AMagickPlayerState::SetupAbilityActorInfo() +{ + AMagickPlayerController* PC = Cast(GetOwner()); + if (!PC) + { + return; + } + + APawn* Pawn = PC->GetPawn(); + + if (!Pawn) + { + return; + } + if (ElistriaAbilitySystemComponent) + { + ElistriaAbilitySystemComponent->InitAbilityActorInfo(this,Pawn); + + if (ManaSet) + { + ElistriaAbilitySystemComponent->AddAttributeSetSubobject(ManaSet.Get()); + } + } + +} diff --git a/Elistria_Calling/Source/Elistria_Calling/Private/ManaAttributeSet.cpp b/Elistria_Calling/Source/Elistria_Calling/Private/ManaAttributeSet.cpp new file mode 100644 index 0000000..17503ab --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Private/ManaAttributeSet.cpp @@ -0,0 +1,34 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "ManaAttributeSet.h" + +UManaAttributeSet::UManaAttributeSet() +{ + InitMana(100.0f); + InitMaxMana(100.0f); +} + +void UManaAttributeSet::GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const +{ + Super::GetLifetimeReplicatedProps(OutLifetimeProps); + + DOREPLIFETIME_CONDITION_NOTIFY(UManaAttributeSet, Mana, COND_None, REPNOTIFY_Always); + DOREPLIFETIME_CONDITION_NOTIFY(UManaAttributeSet, MaxMana, COND_None, REPNOTIFY_Always); +} + +void UManaAttributeSet::OnRep_Mana(const FGameplayAttributeData& OldValue) +{ + GAMEPLAYATTRIBUTE_REPNOTIFY(UManaAttributeSet, Mana, OldValue); + const float OldMana = OldValue.GetCurrentValue(); + const float NewMana = GetMana(); + OnManaChanged.Broadcast(this, OldMana, NewMana); +} + +void UManaAttributeSet::OnRep_MaxMana(const FGameplayAttributeData& OldValue) +{ + GAMEPLAYATTRIBUTE_REPNOTIFY(UManaAttributeSet, MaxMana, OldValue); + const float OldMaxMana = OldValue.GetCurrentValue(); + const float NewMaxMana = GetMaxMana(); + OnMaxManaChanged.Broadcast(this, OldMaxMana, NewMaxMana); +} \ No newline at end of file diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAbilitySystemComponent.h b/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAbilitySystemComponent.h new file mode 100644 index 0000000..49fa0bd --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAbilitySystemComponent.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "AbilitySystemComponent.h" +#include "ElistriaAbilitySystemComponent.generated.h" + +/** + * + */ +UCLASS() +class ELISTRIA_CALLING_API UElistriaAbilitySystemComponent : public UAbilitySystemComponent +{ + GENERATED_BODY() + +}; diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/HealthAttributeSet.h b/Elistria_Calling/Source/Elistria_Calling/Public/HealthAttributeSet.h new file mode 100644 index 0000000..c56acab --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Public/HealthAttributeSet.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "AttributeSet.h" +#include "HealthAttributeSet.generated.h" + +/** + * + */ +UCLASS() +class ELISTRIA_CALLING_API UHealthAttributeSet : public UAttributeSet +{ + GENERATED_BODY() + +}; diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/MagickPlayerController.h b/Elistria_Calling/Source/Elistria_Calling/Public/MagickPlayerController.h new file mode 100644 index 0000000..d8b2030 --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Public/MagickPlayerController.h @@ -0,0 +1,19 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/PlayerController.h" +#include "MagickPlayerController.generated.h" + +/** + * + */ +UCLASS() +class ELISTRIA_CALLING_API AMagickPlayerController : public APlayerController +{ + GENERATED_BODY() + + + virtual void OnPossess(APawn* InPawn) override; +}; diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/MagickPlayerState.h b/Elistria_Calling/Source/Elistria_Calling/Public/MagickPlayerState.h new file mode 100644 index 0000000..70bfbcd --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Public/MagickPlayerState.h @@ -0,0 +1,36 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/PlayerState.h" +#include "AbilitySystemInterface.h" +#include "ElistriaAbilitySystemComponent.h" +#include "ManaAttributeSet.h" +#include "MagickPlayerController.h" +#include "MagickPlayerState.generated.h" + +UCLASS(Config=game) +class ELISTRIA_CALLING_API AMagickPlayerState : public APlayerState, public IAbilitySystemInterface +{ + GENERATED_BODY() + + + + virtual void BeginPlay() override; + +public: + AMagickPlayerState(); + + virtual void GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const override; + virtual UElistriaAbilitySystemComponent* GetAbilitySystemComponent() const override; + + void SetupAbilityActorInfo(); + +protected: + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Abilities, Replicated) + TObjectPtr ElistriaAbilitySystemComponent; + + UPROPERTY(Replicated) + TObjectPtr ManaSet; +}; diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/ManaAttributeSet.h b/Elistria_Calling/Source/Elistria_Calling/Public/ManaAttributeSet.h new file mode 100644 index 0000000..925e3fd --- /dev/null +++ b/Elistria_Calling/Source/Elistria_Calling/Public/ManaAttributeSet.h @@ -0,0 +1,52 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "AttributeSet.h" +#include "AbilitySystemComponent.h" +#include "Net/UnrealNetwork.h" +#include "ManaAttributeSet.generated.h" + +/** + * + */ + +#define ATTRIBUTE_ACCESSORS(ClassName, PropertyName) \ + GAMEPLAYATTRIBUTE_PROPERTY_GETTER(ClassName, PropertyName) \ + GAMEPLAYATTRIBUTE_VALUE_GETTER(PropertyName) \ + GAMEPLAYATTRIBUTE_VALUE_SETTER(PropertyName) \ + GAMEPLAYATTRIBUTE_VALUE_INITTER(PropertyName) + +DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, float, NewValue); + +UCLASS() +class ELISTRIA_CALLING_API UManaAttributeSet : public UAttributeSet +{ + GENERATED_BODY() + +public: + UManaAttributeSet(); + + virtual void GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const override; + + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, ReplicatedUsing=OnRep_Mana) + FGameplayAttributeData Mana; + + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, ReplicatedUsing=OnRep_MaxMana) + FGameplayAttributeData MaxMana; + + ATTRIBUTE_ACCESSORS(UManaAttributeSet, Mana) + ATTRIBUTE_ACCESSORS(UManaAttributeSet, MaxMana) + + UFUNCTION() + void OnRep_Mana(const FGameplayAttributeData& OldValue); + UFUNCTION() + void OnRep_MaxMana(const FGameplayAttributeData& OldValue); + + UPROPERTY(BlueprintAssignable) + FAttributeChangedEvent OnManaChanged; + + UPROPERTY(BlueprintAssignable) + FAttributeChangedEvent OnMaxManaChanged; +}; diff --git a/Elistria_Calling/Source/Elistria_CallingEditor.Target.cs b/Elistria_Calling/Source/Elistria_CallingEditor.Target.cs new file mode 100644 index 0000000..470edd0 --- /dev/null +++ b/Elistria_Calling/Source/Elistria_CallingEditor.Target.cs @@ -0,0 +1,15 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +using UnrealBuildTool; +using System.Collections.Generic; + +public class Elistria_CallingEditorTarget : TargetRules +{ + public Elistria_CallingEditorTarget(TargetInfo Target) : base(Target) + { + Type = TargetType.Editor; + DefaultBuildSettings = BuildSettingsVersion.V5; + + ExtraModuleNames.AddRange( new string[] { "Elistria_Calling" } ); + } +} From 6fd2803d050699278e3015566e86e42563347190 Mon Sep 17 00:00:00 2001 From: Kaitlyn Kinsey Date: Sat, 27 Sep 2025 03:12:08 -0600 Subject: [PATCH 24/33] Added some magick UI (lores art) --- .../MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png | 3 +++ 6 files changed, 18 insertions(+) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png new file mode 100644 index 0000000..1ad478b --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2de65042fe3e527c73ef6fe163b5ebf85e710018117e95c839e680ceab7608a +size 1422454 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png new file mode 100644 index 0000000..5552e40 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3420c72010487f7e64b5b3912c34f917260918c18e404293f7cc233e0712062 +size 1588923 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png new file mode 100644 index 0000000..a38f3d9 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03e78a0ff2d1ad4c48b97bcd9678d0670ed350497c951c3073d09b93f668af16 +size 1782410 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png new file mode 100644 index 0000000..42a864c --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95c0e6cd0164fa7e4ceb1f8328807a8b35645868e2060889665d3c52daa694ee +size 1880662 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png new file mode 100644 index 0000000..a39137a --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ed15137b80d2dba9527bbfa8d179e3f5a75729ed94c789273e9eda2d6f595f2 +size 1674626 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png new file mode 100644 index 0000000..1faffcc --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a142485c0af8cc17bfe5553250536ef615603bd36848c478a25c88c5da98f477 +size 1789658 From 79c0c17de518c60117af80397f0d52e45e988085 Mon Sep 17 00:00:00 2001 From: Kaitlyn Kinsey Date: Mon, 29 Sep 2025 16:28:08 -0600 Subject: [PATCH 25/33] Magick UI --- .../MAIN_CONTENT/Magick_System/UI/UI_Images/DeathLit.uasset | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/DeathUnlit.uasset | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/LifeLit.uasset | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/LifeUnlit.uasset | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/SolarLit.uasset | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/SolarUnlit.uasset | 3 +++ 6 files changed, 18 insertions(+) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DeathLit.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DeathUnlit.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/LifeLit.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/LifeUnlit.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/SolarLit.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/SolarUnlit.uasset diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DeathLit.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DeathLit.uasset new file mode 100644 index 0000000..bdfc406 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DeathLit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47b46232abec189210a0c833598251cdd2172cba73ae1e7f60f5d8a64e710591 +size 1515555 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DeathUnlit.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DeathUnlit.uasset new file mode 100644 index 0000000..42d9d1c --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DeathUnlit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82f26d8d34f5f40fc724acd0e12c9d67e168ae287222e2063de475a4786cd77e +size 1438412 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/LifeLit.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/LifeLit.uasset new file mode 100644 index 0000000..d04fa73 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/LifeLit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e4ede65545b3e5a1272d4812e710a022278ac678981e8119eebbc2bb17d3c04 +size 2366304 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/LifeUnlit.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/LifeUnlit.uasset new file mode 100644 index 0000000..1a52d2c --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/LifeUnlit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e845aeeb6f5a0b01d9365c7e362db737400cc5d4620784a31c0155716a83bac9 +size 2156297 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/SolarLit.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/SolarLit.uasset new file mode 100644 index 0000000..bfab39a --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/SolarLit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:331f405f628d78ffc46e90b3d75cf74e656caed3bed1c95d672177ba92679034 +size 2209124 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/SolarUnlit.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/SolarUnlit.uasset new file mode 100644 index 0000000..cf680c8 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/SolarUnlit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50457465f2858b812659d5f2647c0ac89acbcfda004ad77c67e93700531c8e44 +size 1891120 From f96435eed7927343c6cad2cad558b4c01223ba0c Mon Sep 17 00:00:00 2001 From: Lily Wilson Date: Mon, 29 Sep 2025 16:43:36 -0600 Subject: [PATCH 26/33] Magick System Update 03 --- .../MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset | 4 ++-- .../MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosLit.uasset | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosUnlit.uasset | 3 +++ .../MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png | 3 --- .../MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png | 3 --- .../MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png | 3 --- .../MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png | 3 --- .../Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset | 3 --- .../Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset | 3 --- .../MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png | 3 --- .../MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png | 3 --- .../Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset | 4 ++-- 12 files changed, 10 insertions(+), 28 deletions(-) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosLit.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosUnlit.uasset delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset index 59828c0..275f1e4 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5249343c265ad7efaa6e7cb054dd89c25747e7eb106419ca4f9153619d15003b -size 54769 +oid sha256:3bceef275ff9a529c370f2c847e6b1aa2653f0a3256195c66a39ce492d2ce6d1 +size 56231 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosLit.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosLit.uasset new file mode 100644 index 0000000..299d64c --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosLit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef8e847a3c6f7d7195c76a68785e55b522ffea4f4e1ddb8a2f4ad78ed5ab7b5e +size 2617956 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosUnlit.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosUnlit.uasset new file mode 100644 index 0000000..be81b91 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/ChaosUnlit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:838a6fffaee5441768b5c367e35b4508063d22d5b871d0b7016ba1423868dfc0 +size 2280462 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png deleted file mode 100644 index 1ad478b..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOff.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2de65042fe3e527c73ef6fe163b5ebf85e710018117e95c839e680ceab7608a -size 1422454 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png deleted file mode 100644 index 5552e40..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/DarkRedOn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3420c72010487f7e64b5b3912c34f917260918c18e404293f7cc233e0712062 -size 1588923 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png deleted file mode 100644 index a38f3d9..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOff.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03e78a0ff2d1ad4c48b97bcd9678d0670ed350497c951c3073d09b93f668af16 -size 1782410 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png deleted file mode 100644 index 42a864c..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/GreenOn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95c0e6cd0164fa7e4ceb1f8328807a8b35645868e2060889665d3c52daa694ee -size 1880662 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset deleted file mode 100644 index 6dcbad1..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__5_.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebc8cd8459d195ea6f642e3752cff487b8d869446347a747fd1c2dc060034b37 -size 2280417 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset deleted file mode 100644 index a155e5d..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/Untitled_Artwork__6_.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcc43adbbd9f060dbbefb23d4c880c3af89b00a26e8adeb94b0fcdc7aece74ab -size 2617921 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png deleted file mode 100644 index a39137a..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOff.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ed15137b80d2dba9527bbfa8d179e3f5a75729ed94c789273e9eda2d6f595f2 -size 1674626 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png deleted file mode 100644 index 1faffcc..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/UI_Images/YellowOn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a142485c0af8cc17bfe5553250536ef615603bd36848c478a25c88c5da98f477 -size 1789658 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset index d428efd..046f31e 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddbc8df6c218d05dc6385b5d8de859114fb81e27043cc7a333e5fec7a5fbdd5b -size 398292 +oid sha256:8edc391aa5ee09f96d579396ab81138f5db44f1744d41f4c49f6c50575e70994 +size 405347 From 402471910caec85b8e742b0baf51954919c3ae60 Mon Sep 17 00:00:00 2001 From: "Mason S." <10767492@uvu.edu> Date: Mon, 29 Sep 2025 19:27:24 -0600 Subject: [PATCH 27/33] Barrels and Crates, UV-Mapped --- Raw Content/Models/decor/SM_Barrel01_Closed.fbx | 3 +++ Raw Content/Models/decor/SM_Barrel02_Closed.fbx | 3 +++ Raw Content/Models/decor/SM_Barrel05_Closed.fbx | 3 +++ Raw Content/Models/decor/SM_Barrel05_Open.fbx | 3 +++ Raw Content/Models/decor/SM_Barrel06_Handles.fbx | 3 +++ Raw Content/Models/decor/SM_BarrelHolder.fbx | 3 +++ Raw Content/Models/decor/SM_BarrelNarrow_Closed.fbx | 3 +++ Raw Content/Models/decor/SM_Barrel_Lid.fbx | 3 +++ Raw Content/Models/decor/SM_Bucket.fbx | 3 +++ Raw Content/Models/decor/SM_Crate01_Closed.fbx | 3 +++ Raw Content/Models/decor/SM_Crate_Bin.fbx | 3 +++ Raw Content/Models/decor/SM_Crate_Lid.fbx | 3 +++ Raw Content/Models/decor/SM_Crate_OpenSides.fbx | 3 +++ Raw Content/Models/decor/SM_Crate_OpenSidesLid.fbx | 3 +++ 14 files changed, 42 insertions(+) create mode 100644 Raw Content/Models/decor/SM_Barrel01_Closed.fbx create mode 100644 Raw Content/Models/decor/SM_Barrel02_Closed.fbx create mode 100644 Raw Content/Models/decor/SM_Barrel05_Closed.fbx create mode 100644 Raw Content/Models/decor/SM_Barrel05_Open.fbx create mode 100644 Raw Content/Models/decor/SM_Barrel06_Handles.fbx create mode 100644 Raw Content/Models/decor/SM_BarrelHolder.fbx create mode 100644 Raw Content/Models/decor/SM_BarrelNarrow_Closed.fbx create mode 100644 Raw Content/Models/decor/SM_Barrel_Lid.fbx create mode 100644 Raw Content/Models/decor/SM_Bucket.fbx create mode 100644 Raw Content/Models/decor/SM_Crate01_Closed.fbx create mode 100644 Raw Content/Models/decor/SM_Crate_Bin.fbx create mode 100644 Raw Content/Models/decor/SM_Crate_Lid.fbx create mode 100644 Raw Content/Models/decor/SM_Crate_OpenSides.fbx create mode 100644 Raw Content/Models/decor/SM_Crate_OpenSidesLid.fbx diff --git a/Raw Content/Models/decor/SM_Barrel01_Closed.fbx b/Raw Content/Models/decor/SM_Barrel01_Closed.fbx new file mode 100644 index 0000000..9b1ff12 --- /dev/null +++ b/Raw Content/Models/decor/SM_Barrel01_Closed.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b132dff0e6a1cf467f56314572787ae228f88933666b03a76cb4ce97f2fd471c +size 36800 diff --git a/Raw Content/Models/decor/SM_Barrel02_Closed.fbx b/Raw Content/Models/decor/SM_Barrel02_Closed.fbx new file mode 100644 index 0000000..dd7b5c7 --- /dev/null +++ b/Raw Content/Models/decor/SM_Barrel02_Closed.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c808e5c2ac1a5f4cc678d2322590aaf2f91004693321ea9bdac93a2a193c825a +size 42704 diff --git a/Raw Content/Models/decor/SM_Barrel05_Closed.fbx b/Raw Content/Models/decor/SM_Barrel05_Closed.fbx new file mode 100644 index 0000000..aed60ec --- /dev/null +++ b/Raw Content/Models/decor/SM_Barrel05_Closed.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c56695e86737cdb6b845ca2743be8136b1a408e726d8e1ee62b50f8ab777df00 +size 39376 diff --git a/Raw Content/Models/decor/SM_Barrel05_Open.fbx b/Raw Content/Models/decor/SM_Barrel05_Open.fbx new file mode 100644 index 0000000..286bed9 --- /dev/null +++ b/Raw Content/Models/decor/SM_Barrel05_Open.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93e250ebdb11444b4aeee01bfc9318c88717208b59b14f4d60d1afe12fe2b502 +size 41536 diff --git a/Raw Content/Models/decor/SM_Barrel06_Handles.fbx b/Raw Content/Models/decor/SM_Barrel06_Handles.fbx new file mode 100644 index 0000000..cbaf622 --- /dev/null +++ b/Raw Content/Models/decor/SM_Barrel06_Handles.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fe18075947d31f42619283c2f29c09b509825472bc9ae6919ecd5e634f56bf3 +size 47456 diff --git a/Raw Content/Models/decor/SM_BarrelHolder.fbx b/Raw Content/Models/decor/SM_BarrelHolder.fbx new file mode 100644 index 0000000..09d730c --- /dev/null +++ b/Raw Content/Models/decor/SM_BarrelHolder.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7966a5d0c2565ff308ad348a0a9f000c188f5984ff5e8b77d8d2c53f959eefe7 +size 36976 diff --git a/Raw Content/Models/decor/SM_BarrelNarrow_Closed.fbx b/Raw Content/Models/decor/SM_BarrelNarrow_Closed.fbx new file mode 100644 index 0000000..60ef211 --- /dev/null +++ b/Raw Content/Models/decor/SM_BarrelNarrow_Closed.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:638650fd2a47ead42e047fd56de09f13a293766aec764ea7e2eb074ff2e57bd7 +size 39280 diff --git a/Raw Content/Models/decor/SM_Barrel_Lid.fbx b/Raw Content/Models/decor/SM_Barrel_Lid.fbx new file mode 100644 index 0000000..83cf950 --- /dev/null +++ b/Raw Content/Models/decor/SM_Barrel_Lid.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6eaecd51e5374a3a98766fc491b97beecd4fa44c89ac04ed39036f4e946fb8db +size 35600 diff --git a/Raw Content/Models/decor/SM_Bucket.fbx b/Raw Content/Models/decor/SM_Bucket.fbx new file mode 100644 index 0000000..9d5df4b --- /dev/null +++ b/Raw Content/Models/decor/SM_Bucket.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65aec8c8daa7c181b08d95a7c3ed2a51bb6fd08eac47c2feeacae552f43dbf2c +size 38000 diff --git a/Raw Content/Models/decor/SM_Crate01_Closed.fbx b/Raw Content/Models/decor/SM_Crate01_Closed.fbx new file mode 100644 index 0000000..a23f965 --- /dev/null +++ b/Raw Content/Models/decor/SM_Crate01_Closed.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9751c1befa26e8c0cb078de48d47a5d020a4a1bbb9629022fa486af9584fb20d +size 45728 diff --git a/Raw Content/Models/decor/SM_Crate_Bin.fbx b/Raw Content/Models/decor/SM_Crate_Bin.fbx new file mode 100644 index 0000000..05f08f0 --- /dev/null +++ b/Raw Content/Models/decor/SM_Crate_Bin.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd336f03b5abad61170c0b7aff918b64413056a5ad8c35da28dfb278587b1e7d +size 34272 diff --git a/Raw Content/Models/decor/SM_Crate_Lid.fbx b/Raw Content/Models/decor/SM_Crate_Lid.fbx new file mode 100644 index 0000000..2a2c022 --- /dev/null +++ b/Raw Content/Models/decor/SM_Crate_Lid.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:049858c5a1d8507bb8c25e289231e6266fb174aefd489e8075ed0c27ca61def1 +size 32640 diff --git a/Raw Content/Models/decor/SM_Crate_OpenSides.fbx b/Raw Content/Models/decor/SM_Crate_OpenSides.fbx new file mode 100644 index 0000000..3d708cc --- /dev/null +++ b/Raw Content/Models/decor/SM_Crate_OpenSides.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e3f0fea8e9db0d530552c462684e117cb0e9916400d14fe7555544e67abef48 +size 35232 diff --git a/Raw Content/Models/decor/SM_Crate_OpenSidesLid.fbx b/Raw Content/Models/decor/SM_Crate_OpenSidesLid.fbx new file mode 100644 index 0000000..1a47027 --- /dev/null +++ b/Raw Content/Models/decor/SM_Crate_OpenSidesLid.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4fa287c9178a5afab89ae19411e8b0cbc373c3d1c536b4c97b4a9835527a28e +size 32240 From 896cb6a6059cb929ee2f406011a71d40a0f08a1c Mon Sep 17 00:00:00 2001 From: Lily Wilson Date: Mon, 29 Sep 2025 20:49:19 -0600 Subject: [PATCH 28/33] Indoor Map Update for Valorvale City --- .../Content/MAIN_CONTENT/Levels/L_German_Building_01.umap | 4 ++-- .../Content/MAIN_CONTENT/Levels/L_German_Building_02.umap | 3 +++ .../Content/MAIN_CONTENT/Levels/L_German_Building_03.umap | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_02.umap create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_03.umap diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap index 1b72f92..9091fa3 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap +++ b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_01.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f7c5edcf5caafcd670191c9b91495505d1d9b163dfbec2a1634455217958483 -size 148184 +oid sha256:a1864f09e940f54c9184f373c24f0f70aa7c1a43f3e8760393e9c0844b0f9872 +size 167377 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_02.umap b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_02.umap new file mode 100644 index 0000000..5a629a5 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_02.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d52ce74d0d32b85c7a7d95989b79ca8fd49744661bf36d2d5cf08647546275c +size 138638 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_03.umap b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_03.umap new file mode 100644 index 0000000..fd464e0 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Levels/L_German_Building_03.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24e3cd8f8a57b8727795785e0a9836a6ab540e7c082e6282d9e5e0fb6ee4b07e +size 177006 From aa0c22adbca2a156e66a034a2f83d17c86f7dab4 Mon Sep 17 00:00:00 2001 From: Allen Larsen Date: Tue, 30 Sep 2025 09:55:41 -0600 Subject: [PATCH 29/33] Made more Decor and I UV'd them I made tables, a stool, plate, bowl, cup, and a treasure chest --- Raw Content/Models/decor/Bowl.fbx | 3 +++ Raw Content/Models/decor/Cup.fbx | 3 +++ Raw Content/Models/decor/Plate.fbx | 3 +++ Raw Content/Models/decor/RecTableV1.fbx | 3 +++ Raw Content/Models/decor/RoundTableV1.fbx | 3 +++ Raw Content/Models/decor/RoundTableV2.fbx | 3 +++ Raw Content/Models/decor/StoolV1.fbx | 3 +++ Raw Content/Models/decor/TreasureChestV1.fbx | 3 +++ 8 files changed, 24 insertions(+) create mode 100644 Raw Content/Models/decor/Bowl.fbx create mode 100644 Raw Content/Models/decor/Cup.fbx create mode 100644 Raw Content/Models/decor/Plate.fbx create mode 100644 Raw Content/Models/decor/RecTableV1.fbx create mode 100644 Raw Content/Models/decor/RoundTableV1.fbx create mode 100644 Raw Content/Models/decor/RoundTableV2.fbx create mode 100644 Raw Content/Models/decor/StoolV1.fbx create mode 100644 Raw Content/Models/decor/TreasureChestV1.fbx diff --git a/Raw Content/Models/decor/Bowl.fbx b/Raw Content/Models/decor/Bowl.fbx new file mode 100644 index 0000000..7e30aaf --- /dev/null +++ b/Raw Content/Models/decor/Bowl.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8e8bd1b8ecbf3fb32076d5e95aac6f6f24591efeacfbc78c32e0b6afefe3b35 +size 33856 diff --git a/Raw Content/Models/decor/Cup.fbx b/Raw Content/Models/decor/Cup.fbx new file mode 100644 index 0000000..140c7b0 --- /dev/null +++ b/Raw Content/Models/decor/Cup.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:466a3d1d53df0b3680b657519feb133db9196fd98e0339fb30fe674af0af74a0 +size 33808 diff --git a/Raw Content/Models/decor/Plate.fbx b/Raw Content/Models/decor/Plate.fbx new file mode 100644 index 0000000..4d640eb --- /dev/null +++ b/Raw Content/Models/decor/Plate.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d003974172d74c54d126e0921d9e233d36d6b50a04b50397bccdebedc2a3e82 +size 33856 diff --git a/Raw Content/Models/decor/RecTableV1.fbx b/Raw Content/Models/decor/RecTableV1.fbx new file mode 100644 index 0000000..871da03 --- /dev/null +++ b/Raw Content/Models/decor/RecTableV1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1df7a2b570fe64bddda655c54afc2e80e3f8dead9b68c1720a83d9a81808112f +size 49232 diff --git a/Raw Content/Models/decor/RoundTableV1.fbx b/Raw Content/Models/decor/RoundTableV1.fbx new file mode 100644 index 0000000..46020d9 --- /dev/null +++ b/Raw Content/Models/decor/RoundTableV1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fefe17013eb452c6e11ad3c5c42bd223c7e3ec8abbc67957101f4d5ef2cf73e3 +size 48656 diff --git a/Raw Content/Models/decor/RoundTableV2.fbx b/Raw Content/Models/decor/RoundTableV2.fbx new file mode 100644 index 0000000..f78a2ba --- /dev/null +++ b/Raw Content/Models/decor/RoundTableV2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17e6ab62c6079ec86d87f557b1fa248d4a82caf8eceba6d048eef6dbb543f4b3 +size 37024 diff --git a/Raw Content/Models/decor/StoolV1.fbx b/Raw Content/Models/decor/StoolV1.fbx new file mode 100644 index 0000000..61e0de0 --- /dev/null +++ b/Raw Content/Models/decor/StoolV1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3d82e1d47f4063d57e226998fc45f70a231cefa9a07e1cb91a37581d988512b +size 36528 diff --git a/Raw Content/Models/decor/TreasureChestV1.fbx b/Raw Content/Models/decor/TreasureChestV1.fbx new file mode 100644 index 0000000..f2be745 --- /dev/null +++ b/Raw Content/Models/decor/TreasureChestV1.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fe908bdb38d5c7fa9ead0cd43b13f06b06c3ae6b9624f18e06caca632950e59 +size 92384 From b94ca32d44f1d63df8e62f28dc7e9fc0f79b033f Mon Sep 17 00:00:00 2001 From: Nyx Date: Tue, 30 Sep 2025 11:06:37 -0600 Subject: [PATCH 30/33] Magick stuffs --- Elistria_Calling/Config/Tags/Magic.ini | 40 +++++++++++++++++++ .../Blueprints/BP_MagickPlayerState.uasset | 4 +- .../Spells/GA_PhoenixFlame.uasset | 3 -- .../Spells/GBP_PhoenixFlame.uasset | 4 +- .../Gameplay_Abilities/GA_Oblivion.uasset | 3 ++ .../Gameplay_Abilities/GA_PhoenixFlame.uasset | 3 ++ .../Gameplay_Effects/GE_ManaCost15.uasset | 3 ++ .../Blueprints/BP_ThirdPersonCharacter.uasset | 4 +- 8 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 Elistria_Calling/Config/Tags/Magic.ini delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_Oblivion.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Effects/GE_ManaCost15.uasset diff --git a/Elistria_Calling/Config/Tags/Magic.ini b/Elistria_Calling/Config/Tags/Magic.ini new file mode 100644 index 0000000..a579014 --- /dev/null +++ b/Elistria_Calling/Config/Tags/Magic.ini @@ -0,0 +1,40 @@ +[/Script/GameplayTags.GameplayTagsList] +GameplayTagList=(Tag="Spell.Chaos.Air.BuffetingWinds",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Air.GaleThrust",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Air.Suffocate",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Lightning.FieldOfLightning",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Lightning.Squall",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Lightning.ThunderStrikes",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Water.CleansingWave",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Water.CurrentBash",DevComment="") +GameplayTagList=(Tag="Spell.Chaos.Water.Tsunami",DevComment="") +GameplayTagList=(Tag="Spell.Death.Darkness.Oblivion",DevComment="") +GameplayTagList=(Tag="Spell.Death.Darkness.StolenSight",DevComment="") +GameplayTagList=(Tag="Spell.Death.Darkness.TurnToShadow",DevComment="") +GameplayTagList=(Tag="Spell.Death.Ice.FallenFrost",DevComment="") +GameplayTagList=(Tag="Spell.Death.Ice.PillarsOfIce",DevComment="") +GameplayTagList=(Tag="Spell.Death.Ice.Winter",DevComment="") +GameplayTagList=(Tag="Spell.Death.Necromancy.Apocalypse",DevComment="") +GameplayTagList=(Tag="Spell.Death.Necromancy.RaiseTheDead",DevComment="") +GameplayTagList=(Tag="Spell.Death.Necromancy.VitalityDrain",DevComment="") +GameplayTagList=(Tag="Spell.Life.Blood.Annihilate",DevComment="") +GameplayTagList=(Tag="Spell.Life.Blood.BleedingWounds",DevComment="") +GameplayTagList=(Tag="Spell.Life.Blood.BloodCage",DevComment="") +GameplayTagList=(Tag="Spell.Life.Earth.Entomb",DevComment="") +GameplayTagList=(Tag="Spell.Life.Earth.SplitTheEarth",DevComment="") +GameplayTagList=(Tag="Spell.Life.Earth.StoneShield",DevComment="") +GameplayTagList=(Tag="Spell.Life.Healing",DevComment="") +GameplayTagList=(Tag="Spell.Life.Healing.GiveLife",DevComment="") +GameplayTagList=(Tag="Spell.Life.Healing.RestoringTouch",DevComment="") +GameplayTagList=(Tag="Spell.Life.Healing.Sanctuary",DevComment="") +GameplayTagList=(Tag="Spell.Light.Fire.FireLights",DevComment="") +GameplayTagList=(Tag="Spell.Light.Fire.Meteor",DevComment="") +GameplayTagList=(Tag="Spell.Light.Fire.PheonixFire",DevComment="") +GameplayTagList=(Tag="Spell.Light.Solar.Radiance",DevComment="") +GameplayTagList=(Tag="Spell.Light.Solar.SearingRay",DevComment="") +GameplayTagList=(Tag="Spell.Light.Solar.ShieldOfTheSun",DevComment="") +GameplayTagList=(Tag="Spell.Light.Starlight",DevComment="") +GameplayTagList=(Tag="Spell.Light.Starlight.Constellation",DevComment="") +GameplayTagList=(Tag="Spell.Light.Starlight.SongOfFallingStars",DevComment="") +GameplayTagList=(Tag="Spell.Light.Starlight.StarGuide",DevComment="") + diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset index 3d21d72..06a1414 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81377c0fea41cf55adfa56c15334ed44fdfce9553cda02e22d17e66747780904 -size 40510 +oid sha256:c6acd4c70569b7e4af807f1d097e00f619f2c5fd54315b4050edda6f2644415c +size 40567 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset deleted file mode 100644 index 275f1e4..0000000 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GA_PhoenixFlame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bceef275ff9a529c370f2c847e6b1aa2653f0a3256195c66a39ce492d2ce6d1 -size 56231 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset index 6bbef19..1c32157 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/GBP_PhoenixFlame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9fbf1ee3289dc7711445f470ef96ef38ee070f70a4794129a5ef6846d026c7d -size 2797 +oid sha256:8aa4205ca1c9fc1958287f42ec3fff5f390d29b8fd77b00f28eb7a74b53c91cf +size 2892 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_Oblivion.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_Oblivion.uasset new file mode 100644 index 0000000..c0a1369 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_Oblivion.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:469b566f30a2880fcc59c250b2b050ae3057980b2bb6394dfcf2a08d3d887845 +size 36057 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset new file mode 100644 index 0000000..2723f30 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c5c075f8f35f74584dd7cb959e726ba480b532b06eee774dcaeca19e9fa9d83 +size 53848 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Effects/GE_ManaCost15.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Effects/GE_ManaCost15.uasset new file mode 100644 index 0000000..725c25c --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Effects/GE_ManaCost15.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adb62d331f45e1b96456d94bca18b240e78cbfa997ecf0716bc9041cce3694b3 +size 13110 diff --git a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset index d835c03..f31899c 100644 --- a/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset +++ b/Elistria_Calling/Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14804ce910d3731bbc91645873e604e45005f987cd44007849e7fa0ae2e8711c -size 1463008 +oid sha256:8f87e4aa3e40fcaaa8f752c3f25db408df50eceb46d7de1da4a2dc81d892c45c +size 1455786 From 09c483d6cf601bde9fb60e15203340be45a85819 Mon Sep 17 00:00:00 2001 From: "Mason S." <10767492@uvu.edu> Date: Tue, 30 Sep 2025 16:29:46 -0600 Subject: [PATCH 31/33] Added spear01 to weapons folder --- Raw Content/Models/Weapons/SM_Weapon_Spear01.fbx | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Raw Content/Models/Weapons/SM_Weapon_Spear01.fbx diff --git a/Raw Content/Models/Weapons/SM_Weapon_Spear01.fbx b/Raw Content/Models/Weapons/SM_Weapon_Spear01.fbx new file mode 100644 index 0000000..1c69c8f --- /dev/null +++ b/Raw Content/Models/Weapons/SM_Weapon_Spear01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b518cf619a05ca7055bf04679d814991ed4fd32430cb776bebc9fb9fd263c0e7 +size 38224 From 95a2ff8de64758db504d3747a26dda462cd0df65 Mon Sep 17 00:00:00 2001 From: Nyx Date: Tue, 30 Sep 2025 17:34:28 -0600 Subject: [PATCH 32/33] sync --- .../MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset | 4 ++-- .../Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset | 4 ++-- .../Magick_System/Spells/Gameplay_Effects/GE_ManaRegen.uasset | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Effects/GE_ManaRegen.uasset diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset index 06a1414..5816202 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6acd4c70569b7e4af807f1d097e00f619f2c5fd54315b4050edda6f2644415c -size 40567 +oid sha256:be98126b50f3dc113fc4d14a8d163c19d9973a059e1b1613092fdad8458ac33d +size 54875 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset index 2723f30..638e092 100644 --- a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_PhoenixFlame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c5c075f8f35f74584dd7cb959e726ba480b532b06eee774dcaeca19e9fa9d83 -size 53848 +oid sha256:c9fc408b9f9d37d73644b5dbf1701a98e71f9a5514f1a6655f3fe46166f48f62 +size 69263 diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Effects/GE_ManaRegen.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Effects/GE_ManaRegen.uasset new file mode 100644 index 0000000..c90d6a2 --- /dev/null +++ b/Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Effects/GE_ManaRegen.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa1b23c23b99e547524d3ca6d86e70366d2f51179a93732900391592f5fe60dd +size 13372 From dd8d184da9e07abdecd1098b2ad4bada891bd0b0 Mon Sep 17 00:00:00 2001 From: Lily Wilson Date: Tue, 30 Sep 2025 21:26:47 -0600 Subject: [PATCH 33/33] Magick System Update 04 --- .../Rigs/IK_UE4_Mannequin.uasset | Bin 71194 -> 130 bytes .../Spell_Effects/FireLights.uasset | 3 +++ .../Spell_Effects/PhoenixFire_Volley.uasset | 3 --- .../Spell_Effects/PhoenixFlame_Volley.uasset | 3 +++ .../Gameplay_Abilities/GA_FireLights.uasset | 3 +++ .../Gameplay_Abilities/GA_PhoenixFlame.uasset | 4 ++-- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spell_Effects/FireLights.uasset delete mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spell_Effects/PhoenixFire_Volley.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spell_Effects/PhoenixFlame_Volley.uasset create mode 100644 Elistria_Calling/Content/MAIN_CONTENT/Magick_System/Spells/Gameplay_Abilities/GA_FireLights.uasset diff --git a/Elistria_Calling/Content/Characters/Mannequin_UE4/Rigs/IK_UE4_Mannequin.uasset b/Elistria_Calling/Content/Characters/Mannequin_UE4/Rigs/IK_UE4_Mannequin.uasset index ad3a37d91602bfcd435a0eed4c70b06e6e518740..a3267ad5c12de2825d816f14a58371873c673d61 100644 GIT binary patch literal 130 zcmWN^$qmCG5CFhGRnR~T%ZVT==CiKfJGX&@RMttjDX-cH7Uq zmH8HQU=bIvIVz`~lyy6#SU?5U5J3B6Ts6gEb_q4snq##Y40u~Y0GU*1_n>KSwRK4~ M$7uYJdl{u?f9Z55EC2ui literal 71194 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