Merge branch 'Shiori'

Browse Source

...

This commit is contained in:

benroshio 2025-04-24 01:16:46 -04:00

parent ce119df186 d54a2187d2

commit d95d5284a6

581 changed files with 5208 additions and 138 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/FMOD/Desktop/Master.bank

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Desktop/Master.strings.bank

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Loop_Sweetener.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Appear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Appear_Disappear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_-_Rock_Disappear.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Combat/Sanin/Sanin_Rock_Teleport/Sanin_Rock_Teleport_Start_-_Oneshot.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Dirt_Walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Grass_Run.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Grass_walk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/Footsteps/Stone_Run.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/Sanin_Seq/Montages/04_beam_all.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/Sanin_Seq/Montages/06_chanting_all.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/ABP_Haesol1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/AS_Bow_InPlace_Run_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/AS_Bow_InPlace_Walk_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Hwando_Run_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Walk_Fwd.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Walk_InPlace.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground_2_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliaged_Ground_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Grass.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Grass_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water_Ground_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock_LayerInfo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/IdaFaber/Demo/Animations/Boy/AS_UE5_MM_Jump.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/IdaFaber/Demo/Animations/Boy/AS_UE5_MM_Land.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/067D291C.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1883A555.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1B15B64E.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1CA6CC10.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/20D9487C.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/24CD2F65.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2BE87DD4.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2CBF1416.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2D43A925.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2DE6E3A9.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3E01747B.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3EBE7637.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/457A1354.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/46CD53C6.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/4A856CF6.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5033A088.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/528EAB1B.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/60C6A5A7.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/61BF9D54.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/6FCF773F.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/71B27784.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/74F9F1FD.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7BC3CDFF.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/7BE1D0E5.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/88B3B2EE.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/953EEBCA.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9D83D5B3.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/A133E8F8.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/ABF67778.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/AE1A79F6.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B59CCC19.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B68869C2.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B7C5FC58.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CD803ABE.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/CE20219F.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/D65E81C8.fobj

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E5EFEB1A.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E69665D7.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E6CEC951.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/EF371689.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F6958427.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/F697AA2E.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/FB6FA391.fobj Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{010333e7-6a3f-419f-9308-6f2bf901f6f2}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{097fe95c-fbd5-4a8c-8be8-7c452d9fc2fc}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{0bbb457e-d56a-416c-be6b-d409dd3caa27}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{1398de11-cb1d-4f33-8375-570ac31aa133}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{1f0e974e-08c5-401d-90b8-eda9ad9b0d27}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{22e7f674-6e11-4c64-9219-cf1dc717edfa}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{330299d0-ce39-4d85-9794-ee8fba381f89}.pdc Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{35250175-caa9-4d8d-aa28-1720b27d2ff6}.pdc

Binary file not shown.

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