Commit Graph

80 Commits

Author SHA1 Message Date
c9ebb16f36 Added Spring Song yet again
Triple checked sync with main due to an issue with the Spring map not loading. Everything seems to work now
2025-04-25 19:30:13 -04:00
6f80cafaa3 Revert "Committing Changes(?)"
This reverts commit aac996d671.
2025-04-25 19:14:47 -04:00
5b40e6c814 Revert "Merge branch 'main' into fmod-co"
This reverts commit a42441f427, reversing
changes made to aac996d671.
2025-04-25 17:13:12 -04:00
78a9b1c17d Revert "Added Spring Song (again)"
This reverts commit aa05178a8a.
2025-04-25 17:08:45 -04:00
aa05178a8a Added Spring Song (again)
After syncing with main, got a working clean slate to resume working
2025-04-25 16:25:02 -04:00
a42441f427 Merge branch 'main' into fmod-co 2025-04-25 16:17:22 -04:00
aac996d671 Committing Changes(?)
Committing changes that aren't mine but Git is saying they're mine (Events for footsteps). Shouldn't mess anything up.
2025-04-25 13:35:28 -04:00
fae2bf06dd Added Second Spring Music 2025-04-25 13:17:52 -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
bc78126919 Built bank and added into UE - Sanin Rock Teleport Oneshot 2025-04-18 14:54:30 -04:00
0cac75517d Changed Rock Teleport Move to be a oneshot 2025-04-18 13:54:43 -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
8e498458b7 sfx related changes 2024-12-14 11:10:49 +09:00
7d550155a9 Sanin rock start sound 2024-12-12 03:33:11 -05:00
3e17bfa293 Tree push no trees 2024-12-10 01:11:57 -05:00
c9d3deb757 Merge branch 'main' into fmod-integration 2024-12-07 02:16:51 -05:00
79df45fdec spring level mountain start 2024-12-05 02:09:00 -05:00
f7067deab0 bow and arrows implementation started 2024-12-03 23:30:16 +09:00
6ac6e1e768 mixing and rock 2024-12-01 16:20:18 -05:00
3b6313da44 Big Update and fmod bank fixes 2024-12-01 15:55:22 -05:00
f16aa77dd5 bruh moment 2024-11-30 13:04:27 +09:00