Commit Graph

48 Commits

Author SHA1 Message Date
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
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
2c94031652 had to delete the Docs folder from the plug-ins folder 2025-04-23 00:31:24 +09: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
e1e66072d8 Haesol's Ult and update AI behavior(recorver health), ready to pull from main
Ultimate skill makes NPC drowned and knockback, AI recorver health and back to original position when miss the player
2025-04-09 16:19:28 +09:00
072b4bd146 edit level 2025-04-09 02:35:22 +09:00
545e81dcdc edit level 2025-04-05 02:00:16 +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
06bb0cfcf0 pull the level 2025-03-22 09:59:58 +09:00
e4427e3766 make a new level 2025-03-21 17:36:05 +09:00
0ec37c8330 delete 2025-03-21 13:32:22 +09:00
c083287628 merging changes on my side pt 1 2025-03-06 20:26:27 +09:00
ac52b1992f huge merge from haesol's ability branch 2025-02-21 21:14:29 +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
889f3e5aa2 what's wrong with git and this fmod documentation image i didn't touch anything here 2025-02-18 22:42:51 +09:00
627dd7e0b4 implement haesol's passive 2025-02-17 17:16:49 +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
cf0f8e4c25 editor module changes for FMOD studio 2025-02-03 23:13:19 +09:00
547689631f newly updated FMODStudio plugin for UE5.3 migration 2025-02-02 00:35:31 +09:00
2467ad7d4c newly added updated FMODStudio plugin for migration 2025-02-02 00:16:31 +09:00
ffb7b669f0 heck yeah 2025-01-18 09:48:44 +09:00
7527f8e20b random commit 2024-11-22 21:47:02 -05:00
6ff8cec02b updated AI controllers to have a new base AI controller 2024-11-19 00:06:48 +09:00
566b802e47 merge?? 2024-11-14 12:09:42 +09:00
cf75dcf849 proper commit 2024-11-03 00:23:01 +09:00
f2dcfcea83 ignored? 2024-11-03 00:22:36 +09:00
db7dad84e9 Save/Crafting 2024-10-06 01:24:13 -04:00
f2d7767398 Revert "delete water bottle + new interactables added"
This reverts commit 239c332514.
2024-08-08 10:11:18 +09:00
b62f72eb81 Reapply "added some comments to Haesol's implementation for passive skills"
This reverts commit e4628fcd9d.
2024-08-08 09:59:52 +09:00
e4628fcd9d Revert "added some comments to Haesol's implementation for passive skills"
This reverts commit fde4b47b80.
2024-08-08 09:52:06 +09:00
1cb27502ca Revert "temp commit of binaries before merging"
This reverts commit 36ffa58b4a.
2024-08-08 09:51:59 +09:00
239c332514 delete water bottle + new interactables added 2024-08-08 09:49:32 +09:00
77664953ea temp 2024-08-01 17:53:17 +09:00
8421e12653 Sound implementation for block attack and inventory 2024-07-19 15:09:12 -04:00
38c1531c51 +fmod changes 2024-07-18 18:43:26 -04:00
0c17aa564a Sword Anim Montage 2024-06-27 12:07:26 -04:00
9c53b5f8dc Dash/Inventory 2024-06-12 21:28:17 -04:00
eda6879933 Main Merge 2024-04-08 21:26:44 -04:00
91b3c4c013 bruh moment 84 2024-03-22 19:19:23 -04:00
5bb52e3748 getting rid of .dll 2024-03-22 18:20:41 -04:00
0e4fd6a175 bruh moment? 2024-02-25 17:46:42 -05:00
3af569d9b9 set up pt 1 2024-02-11 15:37:54 -05:00
2c8481bd61 fixed issue 2024-02-10 17:06:19 -05:00