Commit Graph

158 Commits

Author SHA1 Message Date
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
Nolan
0f05fc2eae Bear model + UVs 2025-09-03 21:04:26 -06:00
Nyx
5099ea92d6 added some comments 2025-09-03 13:31:56 -06:00
Lore Natusol
e8e7b294b7 Merge pull request #17 from Civilhero/main
getting the rocks in the raw material file
2025-09-02 21:57:05 -06:00
Allen Larsen
c749975441 Rocks are modeled and UV'd 2025-09-02 21:53:21 -06:00
Lore Natusol
0afbb404f7 Merge pull request #16 from G-ranium/main
Tileable Fences
2025-09-02 21:05:50 -06:00
Gavin Taylor
7d5bf8831d Merge branch 'lorealisnat:main' into main 2025-09-02 17:58:04 -06:00
G-ranium
048e4503b4 Tileable Fence Variants
3 Vine stake fences based on german medieval fencing. Has a right, middle and left piece to create squares.
2 palisade fences based on german/medieval fortifications.
2025-09-02 17:57:02 -06:00
Lily Wilson
17a424ad79 Auto stash before merge of "main" and "origin/main" 2025-09-02 13:56:54 -06:00
Lore Natusol
16687a7549 Merge pull request #14 from TheRiverNyx/develop
Worked on crafting and multiplayer
2025-09-02 13:55:39 -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
63535e3d42 Merge pull request #1 from TheRiverNyx/develop
Merge branch 'lorealisnat:main' into develop
2025-08-30 21:36:41 -06:00
Nyx
09abf17643 Merge branch 'lorealisnat:main' into develop 2025-08-30 21:35:42 -06:00
Nyx
cfae772a8f Merge branch 'lorealisnat:main' into main 2025-08-30 21:35:07 -06:00
Lore Natusol
6eb0f38768 Merge pull request #13 from TheRiverNyx/patch-1
remove Elistria_Calling/Intermediate directory from version control
2025-08-30 21:33:42 -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