17 Commits

Author SHA1 Message Date
Hozach (Audio)
3dda723d5c Merge branch 'main' into Chaz 2025-05-10 13:21:44 -04:00
Hozach (Audio)
f9035b72e2 Added Dialogue UI sounds to FMOD
Also added CO's spring song to the playlist and adjusted the loop range of the playlist. Noting in case it doesn't work out.
2025-05-10 13:19:04 -04:00
Ji Yoon Rhee
89edac3770 what even is this 2025-05-10 21:14:19 +09:00
Ji Yoon Rhee
53546f7059 merge chaz's new files? 2025-05-10 21:06:08 +09:00
benroshio
bed2744ac4 Auto stash before merge of "main" and "origin/main" 2025-05-10 00:26:19 -04:00
Hozach (Audio)
113523b8a6 Committing Added Assets (bunny and fem vox and spring song)
Also recommitting changes to uproject (animations don't save without added metadate I think)

Also omitting this from commit (changes are trying to delete this file):
F:\SAM SSD (iMac SSD2)\Git\Illusion-UE5\hwanyoung2\Content\Illusions\.unsaved\dragon ult uncut.ogg

Seems important?
2025-05-02 16:08:55 -04:00
benroshio
e7ae8a7f0e Fmod Assets Re-Added 2025-02-21 23:35:07 -05:00
Ji Yoon Rhee
60bc0836ed had to delete my old files so that i can fix the merge conflicts on my end 2025-02-08 22:54:14 +09:00
Ji Yoon Rhee
566b802e47 merge?? 2024-11-14 12:09:42 +09:00
Ji Yoon Rhee
5a0369cb38 AI subtrees have been added, player rotation is based on player attacking 2024-10-26 13:38:06 +09:00
Ji Yoon Rhee
6b9c29d295 successfully merged with fmod-integration branch, tiles under the lake fixed 2024-10-06 21:46:02 +09:00
benroshio
db7dad84e9 Save/Crafting 2024-10-06 01:24:13 -04:00
benroshio
967bfe9d81 Asset test 2024-10-04 15:04:46 -04:00
benroshio
0c5e97cd70 Audio asset restructure/crafting and saving 2024-10-04 13:47:33 -04:00
benroshio
d365ddd9f3 haesol and crafting fix 2024-09-25 16:29:36 -04:00
benroshio
9c53b5f8dc Dash/Inventory 2024-06-12 21:28:17 -04:00
benroshio
664e26d786 UI Setup 2024-04-08 23:37:15 -04:00