Compare commits

..

57 Commits

Author SHA1 Message Date
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 8fd7b194f132fdf791b4e83b91fa4a5beca5068f.
2024-08-08 10:11:22 +09:00
Ji Yoon Rhee
f2d7767398 Revert "delete water bottle + new interactables added"
This reverts commit 239c332514250299335d80967dd513ef555fef38.
2024-08-08 10:11:18 +09:00
Ji Yoon Rhee
24d9282709 Revert "added 3d interactables"
This reverts commit bd2326dd08a95acc833f8971acd07229894cc4ca.
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 fbd43c1d23063d33d4a7f18fb7184690b6386e1b.
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 6fa5e7dcbd93682a1776ea6fc4fbb287d67d6635.
2024-08-08 10:04:45 +09:00
Ji Yoon Rhee
4682706487 Revert "push before merge"
This reverts commit 7405cd4205f714aab7c8b4abadfc18cd8b6608af.
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 b888ddbe5d88ed159cc7f9085d44e6234639a8b2.
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 a1a65b521f98a7a601439d48b2db253612577b40.
2024-08-08 10:01:18 +09:00
Ji Yoon Rhee
0f407eb9c4 Revert "push before merge"
This reverts commit 27e503b8b86950aaa6657c44bbe1693d9a3fdb67.
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 bf65a01a5f65e1bee3e49d841e44a5097f8a64d1.
2024-08-08 10:00:54 +09:00
Ji Yoon Rhee
ca4ae06aef Reapply "push before merge"
This reverts commit 5b3217f2e63c7ca55f4aebbabb19025de8081794.
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 420f46c7d314f183cd77c1f4f94d379b7bba469e.
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 e4628fcd9d29a67ab8dad91053b81ed8175b2ebe.
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 122103a77895d75f291696b058420504bb98c6ba, reversing
changes made to e4628fcd9d29a67ab8dad91053b81ed8175b2ebe.
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 fde4b47b801e694c9e7b46ab92cef2d9b2fdc18a.
2024-08-08 09:52:06 +09:00
Ji Yoon Rhee
1cb27502ca Revert "temp commit of binaries before merging"
This reverts commit 36ffa58b4a4014f1294f256635b25b2eae8f6437.
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 6b44048ac4526e0be7f346203631afdaeed35782.
2024-08-08 09:51:57 +09:00
Ji Yoon Rhee
5b3217f2e6 Revert "push before merge"
This reverts commit f13816d379f59372ef244a6d789736d46eb9fc44.
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 d6c73f9f83add29e8fe0002428000dd57bad70f1, reversing
changes made to f13816d379f59372ef244a6d789736d46eb9fc44.
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
Ji Yoon Rhee
2cff725d1c Revert "added some comments to Haesol's implementation for passive skills"
This reverts commit fde4b47b801e694c9e7b46ab92cef2d9b2fdc18a.
2024-08-08 09:22:17 +09:00
Ji Yoon Rhee
1014e7e8c6 Revert "temp commit of binaries before merging"
This reverts commit 36ffa58b4a4014f1294f256635b25b2eae8f6437.
2024-08-08 09:22:11 +09:00
Ji Yoon Rhee
70f19789b1 Revert "created few AOE actor classes for future skill set usage"
This reverts commit 6b44048ac4526e0be7f346203631afdaeed35782.
2024-08-08 09:22:02 +09:00
Ji Yoon Rhee
42fd02358c Revert "push before merge"
This reverts commit f13816d379f59372ef244a6d789736d46eb9fc44.
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 d6c73f9f83add29e8fe0002428000dd57bad70f1, reversing
changes made to f13816d379f59372ef244a6d789736d46eb9fc44.
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
sharon2pan
4d1ee10dac added 3d interactables 2024-08-02 19:22:20 -04: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
sharon2pan
dc95e27bd3 delete water bottle + new interactables added 2024-07-26 21:25:22 -04: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
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
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
benroshio
cd931826c3 Sounds for inventory and dash 2024-06-13 00:19:40 -04:00
198 changed files with 8946 additions and 5275 deletions

BIN
hwanyoung2/Content/FMOD/Buses/A.uasset (Stored with Git LFS)

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Buses/Eq_HP.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Buff_Water.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/UI/Pickup.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Reverbs/ArrowDrawHold.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Snapshots/ArrowDrawHold.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/BP_NPCBase.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More