Commit Graph

227 Commits

Author SHA1 Message Date
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
Lore Natusol
3907130d9a Merge pull request #12 from TheRiverNyx/patch-1
Forgot the underscore in Elistria_Calling
2025-08-28 22:53:24 -06:00
Nyx
5a026493bd Forgot the underscore in Elistria_Calling 2025-08-28 22:52:32 -06:00
Lore Natusol
7c6bad91c6 Merge pull request #11 from TheRiverNyx/develop
Fixed gitignore
2025-08-28 22:46:07 -06:00
Nyx
209c71b890 Merge branch 'lorealisnat:main' into develop 2025-08-28 22:39:28 -06:00
Nyx
e19523daa5 fixed gitignore paths 2025-08-28 22:37:23 -06:00
Lore Natusol
be40ebb9e0 Merge pull request #10 from roo353/main
Folder Updates
2025-08-28 20:52:38 -06:00
Kaitlyn Kinsey
0c08596e2b Folder Updates
Added specific model folders for easy finding
2025-08-28 20:11:22 -06:00
Lore Natusol
7a5520a9d0 Merge pull request #9 from roo353/main
Adding Saved folder to gitignore
2025-04-21 18:49:35 -06:00
Kaitlyn Kinsey
6c02bbdeee Adding Saved folder to gitignore 2025-04-21 12:03:56 -06:00
Lily Wilson
9a5c058dcd Player, Dummy, AI-Dummy Damage Bug Fix 2025-04-17 09:52:51 -06:00
Lore Natusol
1548449716 Merge pull request #8 from roo353/main
AI Enemy Hearing Detection and Dealing Damage
2025-04-16 21:01:10 -06:00
Kaitlyn Kinsey
f3970af546 AI Enemy Hearing Detection and Dealing Damage 2025-04-16 20:55:25 -06:00
Lily Wilson
ffba4575c0 City #1 Update Shrine + Quest System Bug Fixes 2025-04-16 16:32:38 -06:00
Lore Natusol
900ee9549f Update README.md 2025-04-14 09:49:29 -06:00
Lily Wilson
1a8cb8e86e City #1 Update - River + Watermill House 2025-04-14 09:48:48 -06:00
Lily Wilson
3851066d72 Lighting, Volcano Particle Effects, Water Adjustments 2025-04-13 15:42:39 -06:00
Lore Natusol
5d2f1b7edc Merge pull request #7 from roo353/main
Enemy Detection, Chase, and Attack Animation
2025-04-13 08:35:01 -06:00
Kaitlyn Kinsey
53bb414848 Enemy Detection, Chase, and Attack Animation 2025-04-12 18:16:58 -06:00
Lore Natusol
24f435e974 Merge pull request #6 from roo353/main
Bow, Quiver, and Arrow + Navmesh
2025-04-11 18:27:54 -06:00
Kaitlyn Kinsey
71601a66e9 Bow, Quiver, and Arrow + Navmesh 2025-04-09 12:10:20 -06:00
Lily Wilson
83ef3f448f Test Push with New Storage Size 2025-04-09 10:30:57 -06:00
Lily Wilson
ce521c7aec City #1 Update + GoodSky Addition 2025-04-05 15:49:26 -06:00
Lily Wilson
ef3b0b11e5 Fab Store Additions 2025-04-04 12:57:41 -06:00
Lore Natusol
1383cf2ee4 Merge pull request #5 from roo353/main
Added gitignore
2025-04-03 04:47:18 -06:00
Kaitlyn Kinsey
1072d70d1b Added gitignore 2025-04-03 04:33:57 -06:00
Lily Wilson
62af633d36 Equipment System: Head Armor + Body Armor 2025-04-02 03:03:09 -06:00
Lily Wilson
0db21d8e62 Bug Fixes 2025-04-01 23:34:51 -06:00
Lily Wilson
c0db0032f6 Stylized Nature Pack Assets 2025-04-01 22:59:25 -06:00
Lily Wilson
4c22e291bc Merge remote-tracking branch 'origin/main' 2025-04-01 22:44:16 -06:00
Lily Wilson
24570f9383 Equipment System: Bow + Shield Equip, Menu Bug Fixes 2025-04-01 22:44:00 -06:00
Lore Natusol
e0e365a611 Merge pull request #4 from roo353/main
Enemy AI Patrol and More Quest Stuff
2025-03-31 07:21:38 -06:00