Commit Graph

89 Commits

Author SHA1 Message Date
bed2744ac4 Auto stash before merge of "main" and "origin/main" 2025-05-10 00:26:19 -04:00
6ad71ab3dc Auto stash before merge of "main" and "origin/main" 2025-05-09 21:42:31 -04:00
b258f5d4bb Committing Bank and Spring song again 2025-05-09 21:38:02 -04:00
5705039642 Merge branch 'main' into Chaz 2025-05-09 21:34:57 -04:00
ecde0df6ca Dragon audio fix and Menu sounds fix 2025-05-09 19:00:04 -04:00
2c39533212 segmented chest into fmod and UE 2025-05-09 17:25:07 -04:00
332ad0ca2f Chest Sound into FMOD 2025-05-09 16:22:10 -04:00
8dc1d992e2 Merge branch 'main' into Chaz 2025-05-09 11:23:07 -04:00
145aa6f0be DRAGON SOUNDS RAAHHHH 2025-05-06 23:10:23 -04:00
8fa0c08c0f Auto stash before merge of "main" and "origin/main" 2025-05-05 19:09:35 -04:00
ff3e39ab4d deleted the unnecessary puzzle field AOE blueprint from the sprink_test map 2025-05-05 20:30:18 +09:00
b7a4095ee3 Resolve conflict: use remote version of dragon_ult_uncut.uasset 2025-05-05 20:23:35 +09:00
172659a9c7 merge and edit level 2025-05-05 20:21:27 +09:00
c1b2d91c28 Improve dialogue system
remove base hud and add to viewport the dialogue system when dialoguing. and add sprites of bunnies for testing
2025-05-05 19:23:17 +09:00
97670c3df5 bug fix puzzle start event, and implement failed to use mana cuz of insufficient mana
change use mana logic and using haesol's skill logic. change replying logic by updating istrigger
2025-05-04 22:30:40 +09:00
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
f2f8d3ec42 Update from main merge 2025-05-02 14:03:51 -04:00
1d0927426c dragon sounds added in fmod also water footsteps no collisions yet 2025-05-02 14:02:37 -04:00
3aac63c997 Footsteps louder 2025-04-25 22:12:41 -04:00
7f70ce93a9 merge 2025-04-24 15:20:10 +09:00
f809686a56 I need to go to bed commit 2025-04-24 01:47:19 -04:00
d95d5284a6 Merge branch 'Shiori' 2025-04-24 01:16:46 -04:00
d54a2187d2 Assets re added 2025-04-22 13:37:25 -04:00
dafcf19ad4 push before merge 2025-04-22 13:27:33 -04:00
8a16a189df Footsteps implemented + Menu And Arrow sfx bug fixes 2025-04-18 19:03:20 -04:00
e7c2adfd89 Merge branch 'Fmod-Intergration-V2' into Shiori 2025-04-16 12:35:08 -04:00
6dfcbdfd48 Missing Sfx Fix 2025-04-16 12:25:39 -04:00
c2c29e303f Merge branch 'fmod-co' into Fmod-Intergration-V2 2025-04-12 14:05:17 -04:00
701d9bcb05 Merge branch 'fmod-co' into Shiori 2025-04-12 13:52:49 -04:00
e25825931c Sanin timing fix 2025-04-12 13:47:37 -04:00
044238a67d Haesol's Ult and update AI behavior(recorver health)
Ultimate skill makes NPC drowned and knockback, AI recorver health and back to original position when miss the player
2025-04-08 23:43:26 +09:00
499fc3ae18 Footsteps - Grass - Boots 2025-04-04 18:35:16 -04:00
74e1948c35 Rock Teleport for Sanin 2025-04-04 18:28:24 -04:00
e150ec9cba edit level 2025-04-04 15:25:42 +09:00
1b17df5282 integration of SFXs and changing the haesol's character mesh to the updated model in BP_Haesol, pull with care 2025-03-28 22:30:17 +09:00
f385e0049b edit level 2025-03-28 02:50:10 +09:00
5c975ddaa9 Arrow ult sound fix
added to bp_haesol
2025-03-26 23:23:02 -04:00
c2d22e51bd Fmod Events added for take damge bp 2025-03-26 22:13:29 -04:00
e4427e3766 make a new level 2025-03-21 17:36:05 +09:00
0ec37c8330 delete 2025-03-21 13:32:22 +09:00
f3b7524759 shop and arrow array sfx 2025-03-19 13:34:42 -04:00
a245a4dae9 Update test 2025-03-17 12:28:37 -04:00
e7ae8a7f0e Fmod Assets Re-Added 2025-02-21 23:35:07 -05:00
cff82b376f modified the arrow to be stuck to an object more realistically 2025-02-08 22:55:39 +09:00
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
2cb52e12d0 Auto stash before merge of "main" and "origin/main" 2025-02-04 17:26:56 -05:00
38b2151bb3 tried to solve merge conflicts with the thing 2025-02-02 00:15:55 +09:00
7077da1397 FMOD Bow and Sword fix 2025-01-23 00:06:21 -05:00
199476d607 FMOD sword sounds 2025-01-22 21:07:44 -05:00
72da8cc20a Map pt 1 2024-12-15 04:56:49 -05:00