Commit Graph

121 Commits

Author SHA1 Message Date
Nyx
7c11194718 Remove missing asset reference 2025-11-15 01:54:29 -07:00
Nyx
e7205dcb1d worked on attributes 2025-11-15 01:35:35 -07:00
Mason S.
c63db8677f Weapons in Props Folder, Weapon Mats in Materials Folder 2025-11-11 20:49:17 -07:00
Nyx
d34c82b8d9 updated settings for 5.6 2025-11-09 04:38:23 -07:00
Lily Wilson
1d9283ea95 Humanoid Rigs Setup 2025-11-08 16:05:42 -07:00
Lily Wilson
916d914972 Equipment System and Archery System
Slamming my head against a wall for 12 hours please end me
2025-11-07 19:48:25 -07:00
Nyx
718d71202c upgrade to ue5.6 2025-11-06 19:26:47 -07:00
Nyx
01b1bb345d Merge branch 'lorealisnat:main' into main 2025-11-06 08:53:11 -07:00
Mason S.
00378b1c4c Barrels SM in Props Folder, Mats for barrels in Materials Folder 2025-11-04 13:28:37 -07:00
Nyx
35da54c5a2 added OnRep function 2025-10-23 10:00:08 -06:00
Nyx
5b585da3a9 more fixing 2025-10-20 22:44:17 -06:00
Kaitlyn Kinsey
4a9c985d0c Removed Material Pack 2025-10-20 14:35:56 -06:00
Kaitlyn Kinsey
e15bb7a941 Removed Material Pack 2025-10-17 19:41:37 -06:00
Bryce Douglas Olcott
5138042732 Auto stash before rebase of "main" onto "main/main" 2025-10-14 10:48:23 -06:00
Bryce Douglas Olcott
2b794e6836 Auto stash before rebase of "main" onto "main/main" 2025-10-14 10:43:10 -06:00
Nyx
b1249b756e fixed missing BP 2025-10-13 21:52:52 -06:00
Nyx
7bdccd9af9 Merge branch 'lorealisnat:main' into main 2025-10-09 09:10:22 -06:00
Nyx
fbc63350a3 fixing thinbgs 2025-10-09 07:17:27 -06:00
Nyx
599cd852d0 fixing things 2025-10-09 07:16:38 -06:00
Lore Natusol
bf497dea08 Merge pull request #54 from roo353/main
Adding Material Pack
2025-10-08 08:04:11 -05:00
Nyx
cc0a691b31 fixing things 2025-10-07 13:41:34 -06: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