Commit Graph

126 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
8301e2908e edit level - cave 2025-04-26 02:15:16 +09:00
68695fef60 Skill Cooldown UI Implmement
Implement skill cooldown UI and add the skill structure
2025-04-25 21:47:09 +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
dafcf19ad4 push before merge 2025-04-22 13:27:33 -04:00
1bbc60ccf3 merge 2025-04-23 00:46:16 +09:00
8a16a189df Footsteps implemented + Menu And Arrow sfx bug fixes 2025-04-18 19:03:20 -04:00
684769903a Merge branch 'main' into Shiori 2025-04-16 12:37: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
e25825931c Sanin timing fix 2025-04-12 13:47:37 -04:00
261dcd4617 Haesol's Ult and update AI behavior
Ultimate skill makes NPC drowned and knockback, AI recorver health and back to original position when miss the player
2025-04-09 16:48:39 +09:00
96f72616a7 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-09 13:56:27 +09:00
072b4bd146 edit level 2025-04-09 02:35:22 +09: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
2aae5b391a edit level 2025-04-08 12:15:24 +09:00
34ddeeea05 edit level, add campfire asset, plants asset 2025-04-08 04:31:42 +09:00
1a8f87f2ec edit landscape 2025-04-06 21:02:44 +09:00
e150ec9cba edit level 2025-04-04 15:25:42 +09:00
2d2091cf61 Haesol Ult Skill Update and merge with main
Ultimate Skill Mechanism Updated, Use Spline and timeline
2025-04-02 16:27:37 +09:00
bfcdb6dce7 Haesol Ult Skill Update and pull from main
Ultimate Skill Mechanism Updated, Use Spline and timeline
2025-04-01 23:48:59 +09:00
d702c69825 Haesol Ult Skill Update
Ultimate Skill Mechanism Updated, Use Spline and timeline
2025-04-01 23:36:03 +09:00
e17418ac4a HP bar and ult update
Update Boss&AggroNPC HP Bar System and Heasol's Ult Skill
2025-03-27 22:07:25 +09:00
06bb0cfcf0 pull the level 2025-03-22 09:59:58 +09:00
0ec37c8330 delete 2025-03-21 13:32:22 +09:00
08a405291b implement goblin's damage to player 2025-03-10 21:30:51 +09:00
f267b0ecdf Haesol's Bow Animation Montage and Ult Skill Base 2025-03-06 23:31:15 +09:00
52d82da085 please work 2025-03-06 20:27:29 +09:00
c083287628 merging changes on my side pt 1 2025-03-06 20:26:27 +09:00
aff36733c6 sanin's melee attack technical alpha 2025-02-27 21:36:21 +09:00
1d8fb26b83 goblin group combat 2025-02-27 14:59:23 +09:00
e7ae8a7f0e Fmod Assets Re-Added 2025-02-21 23:35:07 -05:00
f9a0194149 conflict fixed 2025-02-22 12:10:06 +09:00
231bc1b8f5 conflict fixed 2025-02-22 12:05:25 +09:00
2a5fdd4700 conflict fixed 2025-02-22 12:03:18 +09:00
46bb5b40d7 merge and conflict fix 2025-02-22 11:35:20 +09:00
ac52b1992f huge merge from haesol's ability branch 2025-02-21 21:14:29 +09:00
e2af4eacd5 map changes (no major changes that affects the current gameplay 2025-02-21 20:15:31 +09:00
3c9526d01f binaries that were missing on this branch + haesol's proj AOE skill halfway done 2025-02-21 00:42:56 +09:00
a1577404f7 Implement Haesol's Passive Skill 2025-02-17 16:06:53 +09:00
2cb52e12d0 Auto stash before merge of "main" and "origin/main" 2025-02-04 17:26:56 -05:00
d8146a9b3b some ignored files ar ebeing pushed rn 2025-02-03 23:22:54 +09:00
6de79fab21 migration for UE5.3, please let me know if there are any issues with pulling the changes 2025-02-02 00:37:45 +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
da686eda62 HOYA 2025-01-18 09:52:56 +09:00
f9ff019cac hoyaa 2025-01-18 09:51:27 +09:00