had to delete my old files so that i can fix the merge conflicts on my end

Browse Source

...

This commit is contained in:

Ji Yoon Rhee 2025-02-08 22:54:14 +09:00

parent e55fabd3b4

commit 60bc0836ed

140 changed files with 0 additions and 3474 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_01.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_02.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_02.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_03.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_03.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Arrow_Impact_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Arrow Impact 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Arrow Release 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Arrow_Impact_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Arrow_Release_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Bow draw 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Bow_draw_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff Haesol.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff Sword/water sword Buff 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff Sword/water sword Buff 2.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff Sword/water sword Buff 3.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff Sword/water sword Buff 4.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff Sword/water sword Buff 5.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff Sword/water sword Buff 6.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff Sword/water sword Buff 7.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Haesol.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_5.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_6.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Buff_Sword/water_sword_Buff_7.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Creak 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Creak 2.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Creak_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Creak_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Haesol finished prob.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Haesol_finished_prob.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Sanin Teleport.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/SaninBaseAttack.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/SaninBaseAttack.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Sanin_Teleport.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Sword block 2.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Sword block.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Sword_block.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Sword_block_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Tk Block Impact.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Tk Block Ready.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Tk_Block_Impact.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Tk_Block_Ready.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Water arrow sounds 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Water arrow trail version 4.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Water arrow trail3.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_sounds_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_trail3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/Water_arrow_trail_version_4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/bow equip.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/bow string.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/bow_equip.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/bow_string.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/dash.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/dash.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/parry.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/parry.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/swor sheathe.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/swor_sheathe.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword 2.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword 3.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword 4.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword draw.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword sheathe.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword_3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword_4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword_draw.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/sword_sheathe.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/water reload.wav (Stored with Git LFS)

Binary file not shown.

0

hwanyoung2/Content/Illusions/Assets/Combat/water sword Buff 1.mp4

BIN

hwanyoung2/Content/Illusions/Assets/Combat/water sword Buff 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/water_reload.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Combat/water_sword_Buff_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/ExplosionBlast_S08WA.111.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/ExplosionBlast_S08WA_111.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Music/Haesol cello finale 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Music/Haesol_cello_finale_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Music/Spring 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Music/Spring_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Music/raon shop.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Music/raon_shop.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Sanin Rock.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Sanin Teleport End.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/SaninButterflyAttack.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/SaninButterflyAttack.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Sanin_Rock.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Sanin_Teleport_End.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Spring Combat 1.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Spring_Combat_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/Sword_block_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/UI/Bag close 3.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/UI/Bag open 3.wav (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/Assets/UI/Bag_close_3.uasset (Stored with Git LFS)

Binary file not shown.

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