Merge branch 'main' into Chaz

Browse Source

...

This commit is contained in:

Hozach (Audio)

2025-05-09 11:23:07 -04:00

parent ebc53ac266 aa100f64f4

commit 8dc1d992e2

121 changed files with 721 additions and 123 deletions

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

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/DRAGON_ULT_2.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/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCControllerBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCControllerBase2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCControllerBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_CheckPlayer.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_Goblin.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_BossField.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/bunny_diffuse.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/bunny_normals.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/bunny_test.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/fur.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/Sanin_Seq/Sequences/damage_f.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SaninController.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/BP_PlayerCharacterBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/Baking.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/chest_diffuse.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/chest_metalic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/chest_normals.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/chest_roughness.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_ao.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_diffuse.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_metals.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_normals.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/lock_roughness.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/metal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_Armature_003_Armature_001Action.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_Armature_003_Armature_001Action_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_Armature_003_Armature_003Action.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_Armature_003_Armature_003Action_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_high_Armature_001Action.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Anim_high_Armature_001Action_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/chest_v9_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/magnolia.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Mugwort.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/DT_DiaglueTable.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/S_DiagloueStructure.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/Anims_TreasureChest/BP_TreasureChestOpen.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/BP_GameInstance.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/BP_TreasureChest.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/S_Lore.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Building/SM_TreeRibbon_Skel.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Building/SM_TreeRibbon_SkelMesh.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Mugwort/Material/Leaf_ligthing.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueOptionWidget.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueWidget.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/T_BunnySprite_Base.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/T_BunnySprite_Happy.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/T_BunnySprite_Sad.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/sanin-sprite-content.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Images/Dialogue_sprites/sanin-sprite-talk.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{0e3a2e3e-32e4-4182-8018-361bb31c6d39}.pdc Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{1f006aa4-2ede-44e7-888d-12cfc0bd0ffd}.pdc

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{36354e40-3dbe-4f55-89f5-e0d93dc1fcf6}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{3896e310-298f-4517-9f89-0ddda1bf8d7d}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{43a3738c-0acc-4951-a6dc-67681b238fc4}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{560e5048-fa34-470c-a547-e017b5f3befd}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{7193869a-af7a-4abf-ac2e-d663b6b44edd}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{7b317089-ccca-48ae-9f1a-6b8308200c06}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{7e119f9b-f0f1-4954-ba30-71821aa433b9}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{8a7ed645-a152-4865-a244-8470f987f3c7}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{8f1e7d26-73b7-4fd0-b70d-d621062ebc01}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{9320f236-2680-4849-a8b0-e89d8e97eb9b}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{b1767621-0ae0-475c-8f68-0acbb39c8ab5}.pdc

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{c7c66cb4-26fb-49bf-919f-8fb5a757e10a}.pdc

Binary file not shown.

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