Commit Graph

132 Commits

Author SHA1 Message Date
Lily Wilson
3eeca5b826 Merge remote-tracking branch 'origin/main' 2025-09-23 17:02:56 -06:00
Lily Wilson
fbaff3beaf Magick System UI Base + Other Shtuff 2025-09-23 17:02:41 -06:00
Lore Natusol
aa8ec28d33 Merge pull request #33 from Civilhero/main
UV mapped and modeled the decor
2025-09-23 11:17:26 -06:00
Allen Larsen
a17ce19443 UV Mapped and modeled Decor
made the corks, the version 1 bed, candles, book, and shelf.
2025-09-23 11:09:36 -06:00
Lore Natusol
4d9e1f1fc4 Merge pull request #32 from ZachRawlings/Zach
Leather Armor + UV Wrap
2025-09-23 10:57:37 -06:00
Lore Natusol
885420ca37 Merge pull request #31 from TheRiverNyx/develop
Enabled unreal plugins for ease of development
2025-09-23 10:57:25 -06:00
Lore Natusol
e101579b69 Merge pull request #30 from ZachRawlings/main
Alligator+UV
2025-09-23 10:57:15 -06:00
Lore Natusol
82fb0ac162 Merge pull request #29 from G-ranium/main
Town hall finished and UV mapped
2025-09-23 10:57:05 -06:00
Zach Rawlings
955a445388 Leather Armor + UV Wrap 2025-09-23 10:41:43 -06:00
Nyx
3ce2906cec Merge branch 'develop' of https://github.com/TheRiverNyx/ElistriaCalling into develop 2025-09-23 10:01:44 -06:00
Nyx
a42fb6e25d even more plugin management 2025-09-23 10:01:18 -06:00
Nyx
a6698b073e even more plugin management 2025-09-23 10:00:05 -06:00
Nyx
4edd7b2fac Enabled unreal plugins for ease of development 2025-09-23 09:33:35 -06:00
G-ranium
90b74d02d7 Town hall finished and UV mapped 2025-09-22 23:10:33 -06:00
Lore Natusol
8b789b5725 Merge pull request #28 from IvanEnvoi/main
Modeled and UV'd Trees
2025-09-18 23:51:26 -06:00
Lore Natusol
05d2f218fd Merge pull request #27 from TheRiverNyx/main
created climbing system
2025-09-18 23:51:10 -06:00
Ivan
efd2a40ff2 Modeled and UV'd Trees 2025-09-18 23:21:12 -06:00
Nyx
d24a911761 completed climbing system 2025-09-17 22:18:55 -06:00
Nyx
38515949db added mantle climb anim 2025-09-17 20:44:57 -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
Nyx
d04ccc3d63 added climbing anims 2025-09-17 19:41:28 -06:00
Zach Rawlings
ddfc761c4c Alligator model and UV 2025-09-13 18:19:17 -06:00
Lore Natusol
32a581ca8d Merge pull request #26 from G-ranium/main
Stall 2 fixed and UV mapped
2025-09-10 18:41:29 -06:00
G-ranium
edaacf5731 Stall 2 fixed and UV mapped 2025-09-10 18:13:58 -06:00
Lore Natusol
2c2eddc7cb Merge pull request #25 from G-ranium/main
2 market stalls modeled and UV mapped
2025-09-10 00:08:08 -06:00
Lore Natusol
58ddb88c90 Merge pull request #24 from HartzellMaxPhillips/main
Added Iron Armor
2025-09-10 00:07:48 -06:00
Lore Natusol
c29d309689 Merge pull request #23 from Civilhero/main
Bottles are modeled
2025-09-10 00:07:32 -06:00
Gavin Taylor
4ec8801ba4 Merge branch 'lorealisnat:main' into main 2025-09-09 23:47:50 -06:00
G-ranium
797fb37960 2 market stalls
the 3rd market stall was having issues and will be UV mapped and pushed tomorrow
2025-09-09 23:46:42 -06:00
Hartzell Max Phillips
901890895c Re-scaled IronArmor
It was really small in the unreal engine, now it's a lot closer to the size it needs to be.
2025-09-09 13:13:20 -06:00
Hartzell Max Phillips
d1f2ff4feb Iron Armor added. 2025-09-09 12:57:51 -06:00
Allen Larsen
0f02b5867b Merge remote-tracking branch 'origin/main' 2025-09-09 12:35:08 -06:00
Allen Larsen
dcb381a96e Modeled and UV'd the bottles 2025-09-09 12:34:53 -06:00
Allen Larsen
e5e9adff9b Merge remote-tracking branch 'origin/main' 2025-09-09 09:39:26 -06:00
Allen Larsen
fbf0ea91c6 Bottles have been modelled
haven't UV'd the bottles yet, will work on decor and corks next
2025-09-09 09:39:08 -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
Lore Natusol
2463b090ce Merge pull request #20 from TheRiverNyx/patch-1
Delete Elistria_Calling/Intermediate directory
2025-09-09 00:27:16 -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
Lore Natusol
a46ab34ee3 Merge pull request #19 from TheRiverNyx/develop
Setup Crafting logic
2025-09-04 11:57:11 -06:00
Nyx
1f4680bf88 setup crafting logic 2025-09-04 11:55:00 -06:00
Nyx
e769a5f3c5 Merge branch 'lorealisnat:main' into develop 2025-09-04 10:27:26 -06:00
Nyx
ad89b1c76a Merge branch 'develop' of github.com:TheRiverNyx/ElistriaCalling into develop 2025-09-04 10:26:09 -06:00
Nyx
c235ec8d43 added files to .gitignore 2025-09-04 10:26:00 -06:00
Nyx
d2f58a96c6 created selectable slot widget 2025-09-04 09:43:34 -06:00
Lore Natusol
b34e295780 Merge pull request #18 from nolioli-kra/main
Bear model + UVs complete
2025-09-04 01:35:06 -06:00