Lore Natusol
|
8a59131f1d
|
Merge pull request #52 from TheRiverNyx/main
bunch o' fixes(not done)
|
2025-10-06 20:14:55 -06:00 |
|
|
|
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 |
|
|
|
f32d8cf0d6
|
Misc Fixes
|
2025-10-06 04:18:03 -06:00 |
|
|
|
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 |
|
Lore Natusol
|
35d818ccde
|
Merge pull request #51 from TheRiverNyx/main
)xxxxx[;;;;;;;;;>
|
2025-10-03 23:53:44 -06:00 |
|
|
|
e4f23cd102
|
Merge branch 'main' of https://github.com/lorealisnat/ElistriaCalling
|
2025-10-03 23:47:47 -06:00 |
|
|
|
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 |
|
Lore Natusol
|
c75233f690
|
Merge pull request #50 from TheRiverNyx/main
performed magic
|
2025-10-02 13:45:16 -06:00 |
|
|
|
15495e8d45
|
performed magic
|
2025-10-02 13:43:27 -06:00 |
|
Lily Wilson
|
cb3866e59b
|
UI Changes
|
2025-10-02 12:38:46 -06:00 |
|
Lore Natusol
|
5b261ae4e7
|
Merge pull request #49 from TheRiverNyx/main
More Magick stuffs
|
2025-10-02 12:38:20 -06:00 |
|
|
|
17fc18d878
|
added field of lightning equipping to WB_Magick
|
2025-10-02 12:33:39 -06:00 |
|
|
|
bb4f66ff12
|
Merge branch 'main' of github.com:TheRiverNyx/ElistriaCalling
|
2025-10-02 10:59:52 -06:00 |
|
|
|
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 |
|
|
|
3879f7f2ec
|
targeting stuffs
|
2025-10-02 10:55:08 -06:00 |
|
Lore Natusol
|
66e6b2b645
|
Merge pull request #48 from HartzellMaxPhillips/main
Mithral armor added
|
2025-10-02 10:36:11 -06:00 |
|
|
|
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 |
|
Hartzell Max Phillips
|
01fae714ac
|
Update MithralArmor.fbx
|
2025-10-01 23:47:56 -06:00 |
|
Hartzell Max Phillips
|
c5303519d2
|
Merge branch 'lorealisnat:main' into main
|
2025-10-01 23:36:15 -06:00 |
|
|
|
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 |
|
Lore Natusol
|
6f6003b4de
|
Merge pull request #47 from TheRiverNyx/main
Setup firelights spell
|
2025-10-01 16:57:45 -06:00 |
|
|
|
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 |
|
Lore Natusol
|
bc38bbd57a
|
Merge pull request #46 from ZachRawlings/Zach
Elven city objects + UVs
|
2025-10-01 15:11:30 -06:00 |
|
Zach Rawlings
|
9fbfe2085b
|
replaced previous fbx files with fbx that have been uv mapped
|
2025-10-01 15:09:36 -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 |
|
Lore Natusol
|
c27335b9b4
|
Merge pull request #45 from G-ranium/main
Guild Hall Complete
|
2025-10-01 01:09:23 -06:00 |
|
G-ranium
|
351d2a1c25
|
Guild Hall Complete
|
2025-09-30 23:46:00 -06:00 |
|
Hartzell Max Phillips
|
1fae4c739f
|
Merge branch 'lorealisnat:main' into main
|
2025-09-30 23:32:24 -06:00 |
|
Hartzell Max Phillips
|
349859178b
|
Added Mithral Armor
|
2025-09-30 23:31:47 -06:00 |
|
Zach Rawlings
|
f26840d80b
|
Modelled elven street objects
Fountain, lantern, lamppost, obelisk
|
2025-09-30 21:52:50 -06:00 |
|
Lily Wilson
|
dd8d184da9
|
Magick System Update 04
|
2025-09-30 21:26:47 -06:00 |
|
Lore Natusol
|
084b36a806
|
Merge pull request #44 from TheRiverNyx/main
sync w/ lore
|
2025-09-30 17:35:07 -06:00 |
|
|
|
95a2ff8de6
|
sync
|
2025-09-30 17:34:28 -06:00 |
|
|
|
caecb4f454
|
Merge branch 'lorealisnat:main' into main
|
2025-09-30 17:03:47 -06:00 |
|
Lore Natusol
|
19f71e907b
|
Merge pull request #43 from Mastraga/main
Added spear01 to weapons folder
|
2025-09-30 16:45:10 -06:00 |
|
Mastraga
|
571b15f234
|
Merge branch 'lorealisnat:main' into main
|
2025-09-30 16:31:59 -06:00 |
|
Mason S.
|
09c483d6cf
|
Added spear01 to weapons folder
|
2025-09-30 16:29:46 -06:00 |
|
Lore Natusol
|
ad143fb4c5
|
Merge pull request #42 from Civilhero/main
I modeled and UV'd more decor
|
2025-09-30 15:18:35 -06:00 |
|
