Merge branch 'main' of https://git.nugamestudioclub.com/neroberovero/Illusion-UE5

Revert "added some comments to Haesol's implementation for passive skills"
This reverts commit fde4b47b801e694c9e7b46ab92cef2d9b2fdc18a.
2024-08-08 09:53:25 +09:00 · 2024-08-08 09:52:06 +09:00 · 2024-08-08 09:51:59 +09:00 · 2024-08-08 09:51:57 +09:00 · 2024-08-08 09:51:48 +09:00 · 2024-08-08 09:51:41 +09:00
175 changed files with 8908 additions and 5249 deletions
--- a/hwanyoung2/Content/FMOD/Buses/A.uasset
+++ b/hwanyoung2/Content/FMOD/Buses/A.uasset
--- a/hwanyoung2/Content/FMOD/Buses/Eq_HP.uasset
+++ b/hwanyoung2/Content/FMOD/Buses/Eq_HP.uasset
--- a/hwanyoung2/Content/FMOD/Desktop/Master.bank
+++ b/hwanyoung2/Content/FMOD/Desktop/Master.bank
--- a/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank
+++ b/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank
--- a/hwanyoung2/Content/FMOD/Events/SFX/Combat/Buff_Water.uasset
+++ b/hwanyoung2/Content/FMOD/Events/SFX/Combat/Buff_Water.uasset
--- a/hwanyoung2/Content/FMOD/Events/SFX/UI/Pickup.uasset
+++ b/hwanyoung2/Content/FMOD/Events/SFX/UI/Pickup.uasset
--- a/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset
+++ b/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset
--- a/hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset
+++ b/hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset
--- a/hwanyoung2/Content/FMOD/Reverbs/ArrowDrawHold.uasset
+++ b/hwanyoung2/Content/FMOD/Reverbs/ArrowDrawHold.uasset
--- a/hwanyoung2/Content/FMOD/Snapshots/ArrowDrawHold.uasset
+++ b/hwanyoung2/Content/FMOD/Snapshots/ArrowDrawHold.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolBlockHold.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolBlockHold.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolDefenseReact.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolDefenseReact.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset
--- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
--- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset
--- a/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset
+++ b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset
--- a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryHUDWidget.uasset
+++ b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryHUDWidget.uasset
--- a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemSlot.uasset
+++ b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemSlot.uasset
--- a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset
+++ b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset
--- a/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br
+++ b/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/06B87BAF.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/06B87BAF.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/096B525D.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/096B525D.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/0F4A25D3.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/0F4A25D3.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/0FB823D7.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/0FB823D7.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/149C3284.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/149C3284.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1AF106A3.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1AF106A3.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1E3951EF.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1E3951EF.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2004891E.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2004891E.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/201E4613.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/201E4613.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2881015A.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2881015A.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/28B7D62D.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/28B7D62D.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/34D03CE4.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/34D03CE4.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/36DA31F4.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/36DA31F4.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/37437A1C.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/37437A1C.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3B3A2686.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3B3A2686.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3B6DFBE6.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3B6DFBE6.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/440B76EC.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/440B76EC.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/4BA9D511.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/4BA9D511.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/52FABF29.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/52FABF29.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5602122D.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5602122D.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/579E86B8.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/579E86B8.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/58990BAE.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/58990BAE.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6759C61E.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6759C61E.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/844579F9.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/844579F9.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/86508BF1.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/86508BF1.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/8FE24A2E.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/8FE24A2E.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A14AAF50.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A14AAF50.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/AF54786B.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/AF54786B.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/C3DFB20F.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/C3DFB20F.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CDFEED0D.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CDFEED0D.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D057BDEE.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D057BDEE.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D3A4D7C2.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D3A4D7C2.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D6456ED1.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D6456ED1.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D80849B6.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D80849B6.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F15CFBFD.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F15CFBFD.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F260DD1F.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F260DD1F.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F5E570FE.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F5E570FE.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FB0F4352.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FB0F4352.fobj
--- a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FF85EBC7.fobj
+++ b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FF85EBC7.fobj
--- a/hwanyoung2/Content/Illusions/.cache/{097fe95c-fbd5-4a8c-8be8-7c452d9fc2fc}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{097fe95c-fbd5-4a8c-8be8-7c452d9fc2fc}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{0e37adfa-589d-4463-9664-761a12aa1bf0}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{0e37adfa-589d-4463-9664-761a12aa1bf0}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{206c79e5-ec8d-4525-9313-2c48b41de8c0}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{206c79e5-ec8d-4525-9313-2c48b41de8c0}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{2e604db7-d09e-4bb6-9165-22d35428ca82}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{2e604db7-d09e-4bb6-9165-22d35428ca82}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{30b14116-1f37-44dd-b072-d31963ed1eed}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{30b14116-1f37-44dd-b072-d31963ed1eed}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{31437fc8-7765-4622-a0a9-08faa249a083}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{31437fc8-7765-4622-a0a9-08faa249a083}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{32fb788c-9449-4ab8-afb8-4565e44c1877}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{32fb788c-9449-4ab8-afb8-4565e44c1877}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{35250175-caa9-4d8d-aa28-1720b27d2ff6}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{35250175-caa9-4d8d-aa28-1720b27d2ff6}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{366c9ccd-d27d-4b41-8ccf-79d7456c803d}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{366c9ccd-d27d-4b41-8ccf-79d7456c803d}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{3a0897f4-a788-4455-9058-8c78a5561c80}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{3a0897f4-a788-4455-9058-8c78a5561c80}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{3e8bab76-6040-4945-a377-b7c013a04475}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{3e8bab76-6040-4945-a377-b7c013a04475}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{40d46784-a42e-4a3a-88ab-a45f836f675a}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{40d46784-a42e-4a3a-88ab-a45f836f675a}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{47959e1d-4582-4123-b548-3ac47803c174}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{47959e1d-4582-4123-b548-3ac47803c174}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{493e8317-989e-4d6e-bc2c-5c3348dd64d2}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{493e8317-989e-4d6e-bc2c-5c3348dd64d2}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{51361f47-1071-42dd-9436-2338965081ac}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{51361f47-1071-42dd-9436-2338965081ac}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{63bbab8f-89ae-4070-8561-ce963b5caab0}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{63bbab8f-89ae-4070-8561-ce963b5caab0}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{7b495f40-63ad-479f-a09b-9139ad95820d}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{7b495f40-63ad-479f-a09b-9139ad95820d}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{8e048db8-e707-4f0e-bf23-3e587af8923a}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{8e048db8-e707-4f0e-bf23-3e587af8923a}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{93c03764-53e6-4ec1-909e-7e40bcb9e4d2}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{93c03764-53e6-4ec1-909e-7e40bcb9e4d2}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{9691d56c-83ea-4801-aa8f-98aa8dfb96dc}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{9691d56c-83ea-4801-aa8f-98aa8dfb96dc}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{98f90c10-d94e-4a1c-b2f6-9fa8055eee67}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{98f90c10-d94e-4a1c-b2f6-9fa8055eee67}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{9aa67dc2-70b1-4a70-a4af-1d1e95d8332b}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{9aa67dc2-70b1-4a70-a4af-1d1e95d8332b}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{9e61281a-b5a7-4f9c-8a85-63ba09d9130e}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{9e61281a-b5a7-4f9c-8a85-63ba09d9130e}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{b8e21bc7-d616-4b96-92c6-a530ba132823}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{b8e21bc7-d616-4b96-92c6-a530ba132823}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{b960fcfb-213c-401d-8405-4938933d5731}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{b960fcfb-213c-401d-8405-4938933d5731}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{b987dc57-a718-4556-a1f8-79f606a0b33e}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{b987dc57-a718-4556-a1f8-79f606a0b33e}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{bc128fa6-b281-48f3-9572-c2b54da201a3}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{bc128fa6-b281-48f3-9572-c2b54da201a3}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{d29c51b2-d6ae-457d-a606-c327b625234b}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{d29c51b2-d6ae-457d-a606-c327b625234b}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{d4c1f2eb-b149-44e3-b36b-51e50a9b55f6}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{d4c1f2eb-b149-44e3-b36b-51e50a9b55f6}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{dbdf0633-d22b-4d14-a967-34499bb707bf}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{dbdf0633-d22b-4d14-a967-34499bb707bf}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{e0d2d86f-3ebd-4d9c-a3e6-6d295e358587}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{e0d2d86f-3ebd-4d9c-a3e6-6d295e358587}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{e179ef98-764a-481e-a25e-a04e091a27b7}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{e179ef98-764a-481e-a25e-a04e091a27b7}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{e98f2cdc-356e-48ac-941c-015f07a4db36}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{e98f2cdc-356e-48ac-941c-015f07a4db36}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{ec8e43a0-0139-48f0-81a2-a000ffa90694}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{ec8e43a0-0139-48f0-81a2-a000ffa90694}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{ee48da4d-7324-4818-b9a4-a359c75bdf09}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{ee48da4d-7324-4818-b9a4-a359c75bdf09}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{efa740e5-6b1c-4323-9d23-602cbfb915e7}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{efa740e5-6b1c-4323-9d23-602cbfb915e7}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{f43340c1-4fe1-4ded-a92e-ef503792b06e}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{f43340c1-4fe1-4ded-a92e-ef503792b06e}.pdc
--- a/hwanyoung2/Content/Illusions/.cache/{f449472d-716c-452f-b0b0-ea5c697584e7}.pdc
+++ b/hwanyoung2/Content/Illusions/.cache/{f449472d-716c-452f-b0b0-ea5c697584e7}.pdc
--- a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml
+++ b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<objects serializationModel="Studio.02.02.00">
-	<object class="MasterAssetFolder" id="{4f34473d-1e56-44db-8dd1-60284d90f95e}" />
-</objects>
--- a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Mixer.user.xml
+++ b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Mixer.user.xml
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<objects serializationModel="Studio.02.02.00">
-	<object class="Mixer" id="{69156779-4c9f-4c75-933c-0886f67a1e32}" />
-</objects>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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	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
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