Merge remote-tracking branch 'origin/main' into fmod-integration

Browse Source

...

This commit is contained in:

benroshio

2024-07-18 18:44:53 -04:00

parent 38c1531c51 096a0f0d2e

commit 535006c027

52 changed files with 120 additions and 45 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/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/Icons/Ginseng.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Tea.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_WaterBottle.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/UI/BP_InventoryHUDWidget.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryHUDWidget.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemSlot.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/DW/QXM6RQ99FE118AU6QMV2TE.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/7/US/Q96A75JKB8QMY8YF13FH92.uasset (Stored with Git LFS) Normal file

Binary file not shown.