Commit Graph

102 Commits

Author SHA1 Message Date
Kaitlyn Kinsey
e15bb7a941 Removed Material Pack 2025-10-17 19:41:37 -06:00
Lore Natusol
bf497dea08 Merge pull request #54 from roo353/main
Adding Material Pack
2025-10-08 08:04:11 -05:00
Kaitlyn Kinsey
559dc10188 Adding Material Pack 2025-10-07 11:48:05 -06:00
Lily Wilson
d0105fde7d Valorvale Map Update 01 2025-10-07 06:34:02 -06:00
Lore Natusol
d2e527041f Merge pull request #53 from roo353/main
Textured Castle and Houses
2025-10-06 20:15:04 -06:00
Kaitlyn Kinsey
2fcbfe1859 Textured Castle and Houses 2025-10-06 15:53:55 -06:00
Nyx
cf27248f9c Merge branch 'main' of github.com:TheRiverNyx/ElistriaCalling
# Conflicts:
#	Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BPC_PlayerStats.uasset
#	Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset
#	Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset
#	Elistria_Calling/Source/Elistria_Calling/Private/Attributes/LevelAttributeSet.cpp
#	Elistria_Calling/Source/Elistria_Calling/Private/Attributes/StaminaAttributeSet.cpp
#	Elistria_Calling/Source/Elistria_Calling/Private/Player/MagickPlayerState.cpp
#	Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h
#	Elistria_Calling/Source/Elistria_Calling/Public/Player/MagickPlayerState.h
2025-10-06 04:22:29 -06:00
Nyx
f32d8cf0d6 Misc Fixes 2025-10-06 04:18:03 -06:00
Nyx
eddf4b0ad9 Misc Fixes 2025-10-05 10:12:44 -06:00
Lily Wilson
ebee88c92b Icon UI Additions + Escape Menu 2025-10-05 05:40:57 -06:00
Nyx
e4f23cd102 Merge branch 'main' of https://github.com/lorealisnat/ElistriaCalling 2025-10-03 23:47:47 -06:00
Nyx
6ed1ebec8c CPP class changes 2025-10-03 23:47:02 -06:00
Lily Wilson
c29d2df874 Open World Map Update (Again) 2025-10-03 18:14:30 -06:00
Lily Wilson
1879ac91ff More UI Updates
help this sh--tuff sucks
2025-10-03 04:10:53 -06:00
Lily Wilson
4b79e5b3d1 Magick UI Update 2025-10-03 00:24:44 -06:00
Lily Wilson
79f5033967 Quest UI Updates 2025-10-02 14:41:13 -06:00
Nyx
15495e8d45 performed magic 2025-10-02 13:43:27 -06:00
Lily Wilson
cb3866e59b UI Changes 2025-10-02 12:38:46 -06:00
Nyx
17fc18d878 added field of lightning equipping to WB_Magick 2025-10-02 12:33:39 -06:00
Nyx
3879f7f2ec targeting stuffs 2025-10-02 10:55:08 -06:00
Nyx
c4eaea0c69 Merge branch 'main' of https://github.com/lorealisnat/ElistriaCalling
# Conflicts:
#	Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset
2025-10-02 08:57:32 -06:00
Nyx
9f964a7ffa Added Meta values(cost, restore) to the mana attribute set 2025-10-01 22:54:52 -06:00
Lily Wilson
d838a7e33a Magick UI Adjustment + New Font 2025-10-01 17:53:49 -06:00
Lily Wilson
76a504ae17 Magick Update 09 2025-10-01 16:58:29 -06:00
Nyx
2dacfe565c Setup firelights spell 2025-10-01 16:56:52 -06:00
Lily Wilson
f5f3333300 Magick System Update 08 2025-10-01 15:44:49 -06:00
Lily Wilson
3de9fa01a3 VFX Additions 2025-10-01 14:37:10 -06:00
Lily Wilson
0692e8c911 Magick System Update 07 2025-10-01 13:58:00 -06:00
Lily Wilson
c9787efae2 Magick System Update 06 2025-10-01 05:38:44 -06:00
Lily Wilson
f5926b9ce9 New Assets + Magick System Update 05 2025-10-01 02:18:00 -06:00
Lily Wilson
880f429217 ASSET CLEAN UP - BIG DELETE 2025-10-01 02:05:22 -06:00
Lily Wilson
dd8d184da9 Magick System Update 04 2025-09-30 21:26:47 -06:00
Nyx
95a2ff8de6 sync 2025-09-30 17:34:28 -06:00
Nyx
b94ca32d44 Magick stuffs 2025-09-30 12:05:13 -06:00
Lily Wilson
896cb6a605 Indoor Map Update for Valorvale City 2025-09-29 20:49:19 -06:00
Lily Wilson
f96435eed7 Magick System Update 03 2025-09-29 16:43:36 -06:00
Kaitlyn Kinsey
79c0c17de5 Magick UI 2025-09-29 16:28:08 -06:00
Kaitlyn Kinsey
6fd2803d05 Added some magick UI
(lores art)
2025-09-27 03:12:08 -06:00
Nyx
a19f26a19d Merge branch 'lorealisnat:main' into main 2025-09-26 17:50:53 -06:00
Nyx
dc2c5af68a magic update #2 2025-09-26 17:50:32 -06:00
Lily Wilson
0a112ed976 Magick System Update 02 2025-09-26 05:40:08 -06:00
Lily Wilson
6da5d7f1fb Magick System Update 01 2025-09-25 14:57:17 -06:00
Lily Wilson
fbaff3beaf Magick System UI Base + Other Shtuff 2025-09-23 17:02:41 -06:00
Nyx
a42fb6e25d even more plugin management 2025-09-23 10:01:18 -06:00
Nyx
4edd7b2fac Enabled unreal plugins for ease of development 2025-09-23 09:33:35 -06:00
Nyx
d24a911761 completed climbing system 2025-09-17 22:18:55 -06:00
Nyx
90a02164bc work on climbing animations 2025-09-17 20:13:10 -06:00
Nyx
8a03a981db imported animations 2025-09-17 19:44:18 -06:00
Lily Wilson
09f6e8aca0 Player Movement Bug Fix + Draft Indoor Level G House 01 2025-09-09 01:30:24 -06:00
Lore Natusol
7b91621767 Merge pull request #21 from TheRiverNyx/main
Completed Crafting system
2025-09-09 00:27:27 -06:00