Commit Graph

163 Commits

Author SHA1 Message Date
benroshio
999bb75337 Combat Music 2024-10-04 18:41:43 -04:00
benroshio
659e8a3975 test 3 2024-10-04 15:22:12 -04:00
benroshio
5289ae8363 Test 2 2024-10-04 15:13:17 -04:00
benroshio
967bfe9d81 Asset test 2024-10-04 15:04:46 -04:00
benroshio
0c5e97cd70 Audio asset restructure/crafting and saving 2024-10-04 13:47:33 -04:00
benroshio
09aec720b3 Merge branch 'main' into fmod-integration 2024-09-25 17:00:44 -04:00
benroshio
79a0aec027 make git happy 2024-09-25 16:55:26 -04:00
benroshio
d365ddd9f3 haesol and crafting fix 2024-09-25 16:29:36 -04:00
Ji Yoon Rhee
564f2a80cd crafting system is fully functional 2024-09-17 00:05:53 +09:00
Ji Yoon Rhee
63d4092c2c level 1, block out started 2024-09-15 08:48:19 +09:00
Ji Yoon Rhee
cf526110b3 lmfao 2024-09-10 10:46:13 +09:00
Ji Yoon Rhee
eeaf691a1a saving/loading systems successfully migrated to player controller 2024-09-05 11:43:15 +09:00
Ji Yoon Rhee
95f07b67ac saving/loading system re-implemented on main branch due to unprecedented bug 2024-08-31 11:50:26 +09:00
Ji Yoon Rhee
682231dd0f the player can pick up consumable items and use items for different effects; needs optimization in player character base BP class 2024-08-27 14:29:55 +09:00
Ji Yoon Rhee
e8cacbe1c7 the player character can automatically pick up souls 2024-08-22 23:24:14 +09:00
Ji Yoon Rhee
d91704b9a7 the NPC drops souls after being eliminated 2024-08-22 23:23:44 +09:00
Ji Yoon Rhee
83e44925bf added attribute sets for each types of attack, optimized some functions 2024-08-20 15:41:33 +09:00
Ji Yoon Rhee
05782979e9 worked on AOE-Fire, integration is pretty much ok 2024-08-10 08:57:30 +09:00
Ji Yoon Rhee
ef7be2cd84 Revert "implemented a temporary fix to the skeletal mesh + animation detachment issue for Haesol and his Hwando sword"
This reverts commit 8fd7b194f1.
2024-08-08 10:11:22 +09:00
Ji Yoon Rhee
f2d7767398 Revert "delete water bottle + new interactables added"
This reverts commit 239c332514.
2024-08-08 10:11:18 +09:00
Ji Yoon Rhee
24d9282709 Revert "added 3d interactables"
This reverts commit bd2326dd08.
2024-08-08 10:11:14 +09:00
Ji Yoon Rhee
89bc3ecacb Revert "added some comments to Haesol's implementation for passive skills"
This reverts commit fbd43c1d23.
2024-08-08 10:04:56 +09:00
Ji Yoon Rhee
51414ad189 Revert "created few AOE actor classes for future skill set usage"
This reverts commit 6fa5e7dcbd.
2024-08-08 10:04:45 +09:00
Ji Yoon Rhee
4682706487 Revert "push before merge"
This reverts commit 7405cd4205.
2024-08-08 10:03:07 +09:00
Ji Yoon Rhee
322fbc3ade Revert "added some comments to Haesol's implementation for passive skills"
This reverts commit b888ddbe5d.
2024-08-08 10:01:34 +09:00
Ji Yoon Rhee
0e71da9cf4 Revert "created few AOE actor classes for future skill set usage"
This reverts commit a1a65b521f.
2024-08-08 10:01:18 +09:00
Ji Yoon Rhee
0f407eb9c4 Revert "push before merge"
This reverts commit 27e503b8b8.
2024-08-08 10:01:02 +09:00
Ji Yoon Rhee
2a923cdd7f Reapply "Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5"
This reverts commit bf65a01a5f.
2024-08-08 10:00:54 +09:00
Ji Yoon Rhee
ca4ae06aef Reapply "push before merge"
This reverts commit 5b3217f2e6.
2024-08-08 10:00:47 +09:00
Ji Yoon Rhee
9c5c627276 Reapply "created few AOE actor classes for future skill set usage"
This reverts commit 420f46c7d3.
2024-08-08 10:00:31 +09:00
Ji Yoon Rhee
b62f72eb81 Reapply "added some comments to Haesol's implementation for passive skills"
This reverts commit e4628fcd9d.
2024-08-08 09:59:52 +09:00
Ji Yoon Rhee
c9c2c13591 Revert "Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5"
This reverts commit 122103a778, reversing
changes made to e4628fcd9d.
2024-08-08 09:59:18 +09:00
Ji Yoon Rhee
122103a778 Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5 2024-08-08 09:53:25 +09:00
Ji Yoon Rhee
e4628fcd9d Revert "added some comments to Haesol's implementation for passive skills"
This reverts commit fde4b47b80.
2024-08-08 09:52:06 +09:00
Ji Yoon Rhee
1cb27502ca Revert "temp commit of binaries before merging"
This reverts commit 36ffa58b4a.
2024-08-08 09:51:59 +09:00
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
Ji Yoon Rhee
db319a6bb9 can i please delete these uassets 2024-08-08 09:42:42 +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