Commit Graph

128 Commits

Author SHA1 Message Date
Ji Yoon Rhee
420f46c7d3 Revert "created few AOE actor classes for future skill set usage"
This reverts commit 6b44048ac4.
2024-08-08 09:51:57 +09:00
Ji Yoon Rhee
5b3217f2e6 Revert "push before merge"
This reverts commit f13816d379.
2024-08-08 09:51:48 +09:00
Ji Yoon Rhee
bf65a01a5f 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:51:41 +09:00
Ji Yoon Rhee
27e503b8b8 push before merge 2024-08-08 09:51:34 +09:00
Ji Yoon Rhee
a1a65b521f created few AOE actor classes for future skill set usage 2024-08-08 09:51:27 +09:00
Ji Yoon Rhee
b888ddbe5d added some comments to Haesol's implementation for passive skills 2024-08-08 09:51:11 +09:00
Ji Yoon Rhee
7405cd4205 push before merge 2024-08-08 09:50:30 +09:00
Ji Yoon Rhee
6fa5e7dcbd created few AOE actor classes for future skill set usage 2024-08-08 09:50:14 +09:00
Ji Yoon Rhee
fbd43c1d23 added some comments to Haesol's implementation for passive skills 2024-08-08 09:49:54 +09:00
sharon2pan
bd2326dd08 added 3d interactables 2024-08-08 09:49:40 +09:00
sharon2pan
239c332514 delete water bottle + new interactables added 2024-08-08 09:49:32 +09:00
Ji Yoon Rhee
8fd7b194f1 implemented a temporary fix to the skeletal mesh + animation detachment issue for Haesol and his Hwando sword 2024-08-08 09:49:24 +09:00
benroshio
56bf0a96a9 Merge? 2024-08-07 20:35:19 -04:00
Ji Yoon Rhee
2cff725d1c Revert "added some comments to Haesol's implementation for passive skills"
This reverts commit fde4b47b80.
2024-08-08 09:22:17 +09:00
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
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
2e9c0d084f changed files on my end 2024-08-01 17:42:56 +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
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
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
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
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
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
06bb51a198 binded input actions for walking and jogging for haesol 2024-06-10 18:40:12 +09:00
benroshio
d4fbc87b5a Merge remote-tracking branch 'origin/main' into fmod-integration 2024-06-09 16:20:22 -04:00
Ji Yoon Rhee
c956bf2978 added death event, stance variable to character blueprint 2024-06-09 22:23:51 +09:00
Ji Yoon Rhee
1b515981f5 created input mapping context for projectile attacks and UI toggling 2024-06-08 23:27:33 +09:00
Ji Yoon Rhee
cf35258254 added anim bp and base character bp 2024-06-08 08:25:27 +09:00
benroshio
5249fa75b6 Merge remote-tracking branch 'origin/main' into fmod-integration 2024-06-05 11:58:43 -04:00
Ji Yoon Rhee
d69e46553f visual effect assets 2024-06-01 12:49:36 +09:00
Ji Yoon Rhee
4e5f371b49 add blueprints for HP system, assets, and MP system 2024-06-01 09:30:13 +09:00
benroshio
2d873057cf New Combat assets and menu 2024-05-24 18:52:22 -04:00
benroshio
2c35bd3e1a Music yo
More Fmod setup abient tracks added
2024-04-12 17:07:31 -04:00
benroshio
664e26d786 UI Setup 2024-04-08 23:37:15 -04:00
benroshio
eda6879933 Main Merge 2024-04-08 21:26:44 -04:00
Ji Yoon Rhee
c5f825f16d committing for now 2024-03-29 19:50:16 -04:00
KenHen
2408ece0ad hi 2024-03-22 19:33:09 -04:00
Ji Yoon Rhee
1b20057b1e bruh moment 2024-03-22 19:27:32 -04:00
KenHen
adc0ca2f3f ??? 2024-03-22 19:26:06 -04:00
KenHen
1315c911a1 idk 2024-03-22 19:20:09 -04:00
benroshio
6c5b66537c Fix Fmod Maybe??? 2024-03-22 19:17:26 -04:00
Ji Yoon Rhee
3cca1ed901 committing before fixing branch issue 2024-03-22 18:05:03 -04:00
benroshio
9096ce0d50 FMOD integration completed 2024-02-25 19:30:18 -05:00
Ji Yoon Rhee
0e42abd151 Revert "mmm"
This reverts commit c07d621e9b.
2024-02-09 21:17:46 -05:00
Ji Yoon Rhee
c07d621e9b mmm 2024-02-09 18:46:44 -05:00
Ji Yoon Rhee
368bbfd2a8 abstract weapon class 2024-02-02 19:55:36 -05:00
Ji Yoon Rhee
b9c0b0f94b data table added for future use of inventory 2024-01-01 23:04:54 +09:00
Ji Yoon Rhee
76d375aae5 major inventory system scripting job done, now onto creating blueprints, input action, and working on the GUI 2024-01-01 21:54:48 +09:00
Ji Yoon Rhee
01555c3ccf initial stuff hopefully this works 2023-10-09 19:37:22 -04:00