Commit Graph

82 Commits

Author SHA1 Message Date
Nyx
5478ddb467 Merge branch 'main' of https://github.com/lorealisnat/ElistriaCalling
# Conflicts:
#	Elistria_Calling/Content/MAIN_CONTENT/Magick_System/UI/WB_Magick.uasset
2025-10-02 10:59:27 -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
Nyx
161f8e6ade Completed crafting 2025-09-08 21:17:33 -06:00
Nyx
859d987c42 Delete Elistria_Calling/Intermediate directory
clean up even more cached files
2025-09-08 13:56:10 -06:00
Nyx
2009803158 fixed some errors when opening crafting menu 2025-09-08 13:49:18 -06:00
Lily Wilson
b875ce5d7a Moving Assets from Raw to Main Content Folders 2025-09-05 00:45:20 -06:00
Nyx
1f4680bf88 setup crafting logic 2025-09-04 11:55:00 -06:00
Nyx
d2f58a96c6 created selectable slot widget 2025-09-04 09:43:34 -06:00
Nyx
5099ea92d6 added some comments 2025-09-03 13:31:56 -06:00
Lily Wilson
17a424ad79 Auto stash before merge of "main" and "origin/main" 2025-09-02 13:56:54 -06:00
Nyx
45bd23d271 switched recipe container to wrapbox instead of uniform grid 2025-09-02 12:16:44 -06:00
Nyx
3c4173c582 attached Inventory actor component to player character. fixed missing recipe data 2025-09-02 10:32:48 -06:00
Nyx
9b1cc9cb3a created item slot for crafting 2025-09-02 09:56:52 -06:00
Nyx
f33c22ef73 worked on inventory system 2025-09-01 23:20:18 -06:00
Nyx
cfae772a8f Merge branch 'lorealisnat:main' into main 2025-08-30 21:35:07 -06:00
Nyx
a5ff79df57 Delete Elistria_Calling/Intermediate directory
Intermediate folder should not be tracked. Its all cached data. Looks like these files were pushed before they got added to the .gitignore. This should help keep commits clean.
2025-08-30 21:30:58 -06:00
Nyx
016baf804c Merge branch 'lorealisnat:main' into main 2025-08-30 21:26:03 -06:00
Lily Wilson
8190e3159a German City House Interior Level 01 2025-08-30 21:25:08 -06:00
Nyx
a0ca3e8626 Merge branch 'lorealisnat:main' into develop 2025-08-30 20:20:57 -06:00
Lily Wilson
13557ce0f6 File Organize 2025-08-30 20:18:39 -06:00
Nyx
d0073dda4e started on refactoring for multiplayer, started crafting system 2025-08-29 00:55:23 -06:00
Nyx
d5b368f86d enabled Steam unreal Plugins 2025-08-28 23:11:53 -06:00