Commit Graph

162 Commits

Author SHA1 Message Date
Ji Yoon Rhee
70f19789b1 Revert "created few AOE actor classes for future skill set usage"
This reverts commit 6b44048ac4.
2024-08-08 09:22:02 +09:00
Ji Yoon Rhee
42fd02358c Revert "push before merge"
This reverts commit f13816d379.
2024-08-08 09:21:51 +09:00
Ji Yoon Rhee
7ccf93ebf5 Revert "Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5"
This reverts commit d6c73f9f83, reversing
changes made to f13816d379.
2024-08-08 09:19:39 +09:00
Ji Yoon Rhee
d6c73f9f83 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2024-08-08 08:51:27 +09:00
Ji Yoon Rhee
f13816d379 push before merge 2024-08-08 08:49:37 +09:00
Ji Yoon Rhee
6b44048ac4 created few AOE actor classes for future skill set usage 2024-08-08 08:49:32 +09:00
Ji Yoon Rhee
36ffa58b4a temp commit of binaries before merging 2024-08-08 08:49:17 +09:00
Ji Yoon Rhee
fde4b47b80 added some comments to Haesol's implementation for passive skills 2024-08-08 08:49:15 +09:00
Ji Yoon Rhee
64cd867812 push before merge 2024-08-08 08:44:48 +09:00
benroshio
4e40a39b55 Merge remote-tracking branch 'origin/main' into fmod-integration 2024-08-07 19:21:17 -04:00
benroshio
d8fed1510e block fixes 2024-08-07 18:17:36 -04:00
sharon2pan
4d1ee10dac added 3d interactables 2024-08-02 19:22:20 -04:00
Ji Yoon Rhee
8bd822a6c6 created few AOE actor classes for future skill set usage 2024-08-02 00:35:08 +09:00
Ji Yoon Rhee
77664953ea temp 2024-08-01 17:53:17 +09:00
Ji Yoon Rhee
2e9c0d084f changed files on my end 2024-08-01 17:42:56 +09:00
Ji Yoon Rhee
90629a6e9e temp commit of binaries before merging 2024-08-01 17:06:44 +09:00
Ji Yoon Rhee
0176cdb366 added some comments to Haesol's implementation for passive skills 2024-07-27 10:27:58 +09:00
sharon2pan
dc95e27bd3 delete water bottle + new interactables added 2024-07-26 21:25:22 -04:00
Ji Yoon Rhee
9fa044da25 implemented a temporary fix to the skeletal mesh + animation detachment issue for Haesol and his Hwando sword 2024-07-20 23:21:26 +09:00
benroshio
66ea60f725 Pickup and block Fix 2024-07-19 18:43:52 -04:00
benroshio
8421e12653 Sound implementation for block attack and inventory 2024-07-19 15:09:12 -04:00
benroshio
535006c027 Merge remote-tracking branch 'origin/main' into fmod-integration 2024-07-18 18:44:53 -04:00
benroshio
38c1531c51 +fmod changes 2024-07-18 18:43:26 -04:00
benroshio
5b111fd551 Buff added 2024-07-18 18:42:37 -04:00
Ji Yoon Rhee
096a0f0d2e player HUD hp,mp bar functionality completed 2024-07-18 16:24:28 +09:00
Ji Yoon Rhee
5a4b0635ce inventory HUD is now fully functional, graphics not finalized 2024-07-18 14:40:09 +09:00
benroshio
119362de63 Merge remote-tracking branch 'origin/main' into fmod-integration 2024-07-14 18:49:31 -04:00
benroshio
0e509e4937 Bow Draw Added 2024-07-14 18:33:51 -04:00
Ji Yoon Rhee
f55937e63c got the buff skill implementation started as well as the AOE skill base blueprint class 2024-07-13 10:10:53 +09:00
Ji Yoon Rhee
21b5f7f53f blocking 2024-07-13 07:49:22 +09:00
Ji Yoon Rhee
79e9c28851 fixed the issues with animation montages not playing at command 2024-07-03 21:20:19 +09:00
Ji Yoon Rhee
75b078f5e3 created event dispatchers for damage blocking, death, and such 2024-06-30 23:25:01 +09:00
benroshio
0c17aa564a Sword Anim Montage 2024-06-27 12:07:26 -04:00
benroshio
b7c9736c48 Merge branch 'main' into fmod-integration 2024-06-24 18:03:44 -04:00
benroshio
9aa9d15e13 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2024-06-23 11:43:16 -04:00
Ji Yoon Rhee
6846c027f1 ^ 2024-06-22 09:55:52 +09:00
Ji Yoon Rhee
037d5442a5 inventory shows collected items, new anim BPs are created and modified for combat system 2024-06-22 09:55:29 +09:00
Ji Yoon Rhee
7c5833f033 implemented pick up item 2024-06-17 23:38:43 +09:00
Ji Yoon Rhee
959723df6a added buff/debuff related components and structs for future use 2024-06-13 14:19:47 +09:00
benroshio
cd931826c3 Sounds for inventory and dash 2024-06-13 00:19:40 -04:00
benroshio
57fc23c8b0 Merge branch 'fmod-integration' 2024-06-12 21:30:10 -04:00
benroshio
9c53b5f8dc Dash/Inventory 2024-06-12 21:28:17 -04:00
benroshio
32ea3d2d49 Merge branch 'main' into fmod-integration 2024-06-12 20:01:16 -04:00
Ji Yoon Rhee
8b5c9a1f4b still working on implementing the CheckForIntertactable(). the ui is buggy 2024-06-12 22:48:50 +09:00
Ji Yoon Rhee
ce82fffdda implemented dashing on blueprints 2024-06-12 22:47:53 +09:00
benroshio
d9fdf4a0a7 Auto stash before merge of "fmod-integration" and "origin/fmod-integration" 2024-06-11 16:18:25 -04:00
benroshio
d5df643577 Merge remote-tracking branch 'origin/main' into fmod-integration 2024-06-11 16:07:25 -04:00
Ji Yoon Rhee
18abbad56d changed some input-related code in player charac controller 2024-06-11 21:53:04 +09:00
Ji Yoon Rhee
917a1bb668 can toggle up inventory UI, can't tell if the input bindings for using item from inventory overlaps with that for normal melee attack 2024-06-11 21:52:34 +09:00
Ji Yoon Rhee
68d9fafdf6 added input action reference for walking, binded IA_Walk to Move() function 2024-06-10 18:41:00 +09:00