Commit Graph

  • 0a2353eb24 merge main 7heIVIaze 2025-05-09 17:00:06 +09:00
  • 76dfbba704 Made Dialogue Eye Close/Open Animation, Fix Bugs 7heIVIaze 2025-05-09 16:43:30 +09:00
  • 12b6657adf modeling bridge asset wonjoon 2025-05-09 14:33:37 +09:00
  • f632fe17b2 organizing asset folders wonjoon 2025-05-09 03:01:35 +09:00
  • 2a64c6f684 solve merge confliction 7heIVIaze 2025-05-07 21:16:09 +09:00
  • 95c35329e9 Make Game Instance and a structure to manage lore data. And Fix Haesol's AOE Skill bugs, mobs group battle 7heIVIaze 2025-05-07 21:10:05 +09:00
  • 1da96a5dc3 edit level - bunny boss area, gobiln combat area wonjoon 2025-05-07 15:19:59 +09:00
  • 145aa6f0be DRAGON SOUNDS RAAHHHH benroshio 2025-05-06 23:10:23 -04:00
  • ecbef9d6ae Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 7heIVIaze 2025-05-06 20:37:02 +09:00
  • 314e940487 Fix Puzzle area respawn error. 7heIVIaze 2025-05-06 20:36:55 +09:00
  • 8fa0c08c0f Auto stash before merge of "main" and "origin/main" benroshio 2025-05-05 19:09:35 -04:00
  • 670df2f1c3 edit level, add item box wonjoon 2025-05-05 23:57:39 +09:00
  • ff3e39ab4d deleted the unnecessary puzzle field AOE blueprint from the sprink_test map Ji Yoon Rhee 2025-05-05 20:30:18 +09:00
  • 635c4bfb04 improved dialogue system for puzzle NPC Ji Yoon Rhee 2025-05-05 20:29:29 +09:00
  • 56630f16bf treasure chest BP Ji Yoon Rhee 2025-05-05 20:29:00 +09:00
  • b7a4095ee3 Resolve conflict: use remote version of dragon_ult_uncut.uasset wonjoon 2025-05-05 20:23:35 +09:00
  • 172659a9c7 merge and edit level wonjoon 2025-05-05 20:21:27 +09:00
  • c1b2d91c28 Improve dialogue system 7heIVIaze 2025-05-05 19:23:17 +09:00
  • 97670c3df5 bug fix puzzle start event, and implement failed to use mana cuz of insufficient mana 7heIVIaze 2025-05-04 22:30:40 +09:00
  • f44eb40592 change the logic of puzzle start 7heIVIaze 2025-05-04 00:37:10 +09:00
  • 0fa45e41c5 i added the bunny NPC and stuff, please use my version of the map file Ji Yoon Rhee 2025-05-04 00:21:47 +09:00
  • 4a9bd8766d added some more dialogues and useful assets like tree ribbons(?) and treasure chest Ji Yoon Rhee 2025-05-04 00:21:05 +09:00
  • dfad2e0010 BTTs abstracted to use for both types of NPCs + bunny NPC can use dialogue to indicate puzzle success/fail Ji Yoon Rhee 2025-05-04 00:17:38 +09:00
  • ebc53ac266 Merge branch 'main' into Chaz Chaz Hozach (Audio) 2025-05-03 10:31:15 -04:00
  • ba805ee70b add treeribbon asset wonjoon 2025-05-03 13:06:26 +09:00
  • 5d9b550d18 Commit merge main into my branch! Hozach (Audio) 2025-05-02 20:19:01 -04:00
  • eecffe8dca Merge branch 'main' into Chaz Hozach (Audio) 2025-05-02 20:18:32 -04:00
  • d0980840ad complete merge Ji Yoon Rhee 2025-05-03 08:52:55 +09:00
  • 113523b8a6 Committing Added Assets (bunny and fem vox and spring song) Hozach (Audio) 2025-05-02 16:08:55 -04:00
  • b0a7367b7a Committing animation SFX FMOD asset and implementation into Sanin animation Hozach (Audio) 2025-05-02 14:59:27 -04:00
  • f2f8d3ec42 Update from main merge Shiori benroshio 2025-05-02 14:03:51 -04:00
  • 3ce7aa9c2c Merge branch 'main' into Shiori benroshio 2025-05-02 14:03:05 -04:00
  • 1d0927426c dragon sounds added in fmod also water footsteps no collisions yet benroshio 2025-05-02 14:02:37 -04:00
  • d23ae431f6 merge 7heIVIaze 2025-05-02 23:59:49 +09:00
  • 981d34b6e1 Improve dialogue system and mana 7heIVIaze 2025-05-02 23:57:48 +09:00
  • acbe5e2541 edit level - new combat area, waterbottle item arrangement wonjoon 2025-05-02 19:19:09 +09:00
  • ac80d9cc3e add HouseofChangwon asset and buliding basecamp wonjoon 2025-05-02 14:57:09 +09:00
  • 34d500dfb7 merge wonjoon 2025-05-02 11:11:14 +09:00
  • 8b76377bb4 added the nav mesh for bunny AI + incorporated dialogues into bunny NPC Ji Yoon Rhee 2025-05-01 23:50:59 +09:00
  • 8df0a34483 Improve the dialogue system 7heIVIaze 2025-05-01 23:15:49 +09:00
  • 7f32f2740a Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 7heIVIaze 2025-05-01 21:28:19 +09:00
  • 850726d685 prepare for pull 7heIVIaze 2025-05-01 21:27:22 +09:00
  • 4e1bfde84b updated the map from the updates in puzzle NPC + changed the fonts for the dialogue WG Ji Yoon Rhee 2025-05-01 19:09:02 +09:00
  • d778a0b0e7 fixed some dialogue options and added korean trasnlations Ji Yoon Rhee 2025-05-01 19:08:20 +09:00
  • 84cfc72ef9 merge for dragon anims Ji Yoon Rhee 2025-05-01 19:07:30 +09:00
  • 38fe73dee0 i forgot to add this on the first commit Ji Yoon Rhee 2025-05-01 19:07:07 +09:00
  • 36ba2fc70a minor rig changes, i don't even know what they are so you can probably ignore them Ji Yoon Rhee 2025-05-01 19:06:45 +09:00
  • f0b55cacaf BT: bunny state can go fleeing <--> seen Ji Yoon Rhee 2025-05-01 19:06:11 +09:00
  • f746612cbd Fix Cooldown System & UI Bugs, and solved pull confliction 7heIVIaze 2025-05-01 13:02:35 +09:00
  • 75c36782a9 Implemented dialogue system and dialogue UI prototype 7heIVIaze 2025-05-01 12:23:10 +09:00
  • 5e8425c505 added the scripts in the dialogue DT and translated in Korean Ji Yoon Rhee 2025-05-01 00:03:46 +09:00
  • 28b3894640 Bug Fix 7heIVIaze 2025-04-29 22:16:20 +09:00
  • b8e2c42e0f fixed some buggies Ji Yoon Rhee 2025-04-29 22:10:51 +09:00
  • e8af48a1de please do not add the fmod studio documentations plz Ji Yoon Rhee 2025-04-29 22:05:24 +09:00
  • ce1636e2d7 Ready to push 7heIVIaze 2025-04-29 22:03:14 +09:00
  • 60f69205a2 ready for pulling 7heIVIaze 2025-04-29 21:03:02 +09:00
  • d84d9753b8 added the bunny NPC and interactable bunny to the map for functionality test Ji Yoon Rhee 2025-04-29 16:40:30 +09:00
  • bc7f6ad9f3 added the dialogue starting feature to the puzzle NPCs and player controller Ji Yoon Rhee 2025-04-29 16:40:04 +09:00
  • af0ac5c5c2 Try to Implement Dialogue System and Improve the Crafting UI 7heIVIaze 2025-04-29 16:38:23 +09:00
  • 534fd64c77 merge wonjoon 2025-04-28 23:58:13 +09:00
  • 5035dcf469 added the interface for dialogue system Ji Yoon Rhee 2025-04-28 23:12:47 +09:00
  • 1ee45e69ac added a temporary speech bubble UI, need to add the functionality for scripts Ji Yoon Rhee 2025-04-27 19:57:04 +09:00
  • 84f07a5c39 i probably cleaned up some code in health bar but no serious edits have been done Ji Yoon Rhee 2025-04-27 17:14:56 +09:00
  • 3ea9c3ab01 added the bunny NPC and interactable bunny on the map Ji Yoon Rhee 2025-04-27 17:14:24 +09:00
  • 3b8bc7304b fixed a bug where haesol cant trigger a sound event with buff skill when used without a weapon wielded Ji Yoon Rhee 2025-04-27 17:14:03 +09:00
  • 06371a7430 bunny NPC can now perceive stimuli and run away from the player when one of the bunnies get attacked Ji Yoon Rhee 2025-04-27 17:13:08 +09:00
  • 0bdc6c13dd fixed a weird issue with movement speed enum variable in aggro NPC bp class Ji Yoon Rhee 2025-04-27 17:12:28 +09:00
  • bef500e818 applied cel-shader on crafting table Ji Yoon Rhee 2025-04-26 23:42:12 +09:00
  • 1e50a43086 organized files, added BTTs for the bunny NPC implementation Ji Yoon Rhee 2025-04-26 23:40:22 +09:00
  • 3aac63c997 Footsteps louder benroshio 2025-04-25 22:12:41 -04:00
  • 9e58fbdc7c Merge branch 'main' into Shiori benroshio 2025-04-25 20:50:07 -04:00
  • 6dbcab69d2 Arrow Sounds Readded benroshio 2025-04-25 19:30:09 -04:00
  • 8301e2908e edit level - cave wonjoon 2025-04-26 02:15:16 +09:00
  • 4e963403ad Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 7heIVIaze 2025-04-25 21:47:20 +09:00
  • 68695fef60 Skill Cooldown UI Implmement 7heIVIaze 2025-04-25 21:47:09 +09:00
  • 9145d18cdd edit level wonjoon 2025-04-25 18:50:25 +09:00
  • 2c028658bb edit level wonjoon 2025-04-25 00:41:42 +09:00
  • fd777aba62 added the puzzle area for the bunny Ji Yoon Rhee 2025-04-25 00:05:03 +09:00
  • 7ab90f7625 prepare to pull 7heIVIaze 2025-04-24 22:03:43 +09:00
  • 0a198096e8 the font changes got wiped, re-pushing Ji Yoon Rhee 2025-04-24 21:54:15 +09:00
  • 82d6e54754 footstep sounds Ji Yoon Rhee 2025-04-24 21:53:53 +09:00
  • a0b0117d7c rearranged some files, added base bunny logic blueprints Ji Yoon Rhee 2025-04-24 21:53:32 +09:00
  • e31a861a28 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 Ji Yoon Rhee 2025-04-24 15:22:20 +09:00
  • dd71ece538 re-adding the stylized foliage assets for wonjun Ji Yoon Rhee 2025-04-24 15:21:35 +09:00
  • 7f70ce93a9 merge wonjoon 2025-04-24 15:20:10 +09:00
  • 4bedd6f2f3 fixed the VFX (it was wiped from shiori's merge) Ji Yoon Rhee 2025-04-24 15:14:49 +09:00
  • f809686a56 I need to go to bed commit benroshio 2025-04-24 01:47:19 -04:00
  • d95d5284a6 Merge branch 'Shiori' benroshio 2025-04-24 01:16:46 -04:00
  • ce119df186 Revert "stylized grass pack added" benroshio 2025-04-24 00:49:44 -04:00
  • e22942f7e4 Revert "push before merge" Fmod-Intergration-V2 benroshio 2025-04-24 00:42:31 -04:00
  • 171251b4e1 stylized grass pack added Ji Yoon Rhee 2025-04-23 20:56:08 +09:00
  • abad527aae new foliage assets Ji Yoon Rhee 2025-04-23 20:55:38 +09:00
  • dcf8eef0e6 removed unused foliage Ji Yoon Rhee 2025-04-23 20:54:43 +09:00
  • 1b00512305 just push wonjoon 2025-04-23 20:36:44 +09:00
  • 5a458545e3 prepare to pull 7heIVIaze 2025-04-23 17:05:21 +09:00
  • d54a2187d2 Assets re added benroshio 2025-04-22 13:37:25 -04:00
  • dafcf19ad4 push before merge benroshio 2025-04-22 13:27:33 -04:00
  • c0aa37c621 Resolved merge conflict using remote version of Sprink_TEST.umap wonjoon 2025-04-23 00:55:45 +09:00
  • 1bbc60ccf3 merge wonjoon 2025-04-23 00:46:16 +09:00
  • 8b01d76722 changed the font for inventory item slot UI item Ji Yoon Rhee 2025-04-23 00:37:48 +09:00