|
|
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 |
|
Lore Natusol
|
66e6b2b645
|
Merge pull request #48 from HartzellMaxPhillips/main
Mithral armor added
|
2025-10-02 10:36:11 -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 |
|
|
|
b94ca32d44
|
Magick stuffs
|
2025-09-30 12:05:13 -06:00 |
|
Allen Larsen
|
aa0c22adbc
|
Made more Decor and I UV'd them
I made tables, a stool, plate, bowl, cup, and a treasure chest
|
2025-09-30 09:55:41 -06:00 |
|
Lily Wilson
|
896cb6a605
|
Indoor Map Update for Valorvale City
|
2025-09-29 20:49:19 -06:00 |
|
Lore Natusol
|
9929c141d1
|
Merge pull request #41 from Mastraga/main
Barrels and Crates, UV-Mapped
|
2025-09-29 20:21:52 -06:00 |
|
Mason S.
|
402471910c
|
Barrels and Crates, UV-Mapped
|
2025-09-29 19:27:24 -06:00 |
|
Lily Wilson
|
f96435eed7
|
Magick System Update 03
|
2025-09-29 16:43:36 -06:00 |
|
Lore Natusol
|
14d2d97d07
|
Merge pull request #40 from roo353/main
Magick UI
|
2025-09-29 16:30:19 -06:00 |
|
Kaitlyn Kinsey
|
79c0c17de5
|
Magick UI
|
2025-09-29 16:28:08 -06:00 |
|
Lore Natusol
|
e80d484660
|
Merge pull request #39 from roo353/main
Added some magick UI
|
2025-09-29 16:02:03 -06:00 |
|
Kaitlyn Kinsey
|
6fd2803d05
|
Added some magick UI
(lores art)
|
2025-09-27 03:12:08 -06:00 |
|
Lore Natusol
|
a4db9a50ea
|
Merge pull request #38 from TheRiverNyx/main
Magick System Update 2
|
2025-09-26 21:26:42 -06:00 |
|
|
|
a19f26a19d
|
Merge branch 'lorealisnat:main' into main
|
2025-09-26 17:50:53 -06:00 |
|
|
|
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 |
|
Lore Natusol
|
b2c8888670
|
Merge pull request #37 from Mastraga/main
Added Greatswords and Scythe to weapons folder
|
2025-09-26 05:19:10 -06:00 |
|
Mason S.
|
055cb0a45f
|
Added Greatswords and Scythe to weapons folder
|
2025-09-25 16:44:49 -06:00 |
|
Lily Wilson
|
6da5d7f1fb
|
Magick System Update 01
|
2025-09-25 14:57:17 -06:00 |
|
Lore Natusol
|
35577840d4
|
Merge pull request #36 from Mastraga/main
Dagger01 and Dagger02 with UV's done
|
2025-09-25 13:26:19 -06:00 |
|
Mason S.
|
e7e467e5fb
|
Dagger01 and Dagger02 with UV's done
|
2025-09-24 14:20:57 -06:00 |
|
Lore Natusol
|
7b4b0abb8b
|
Merge pull request #35 from LincolnRules2000/main
Cliff pieces & rocks + UVs
|
2025-09-24 01:06:48 -06:00 |
|
