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

Browse Source

...

This commit is contained in:

benroshio 2024-06-05 11:58:43 -04:00

parent 2d873057cf d69e46553f

commit 5249fa75b6

1622 changed files with 6079 additions and 2657 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

hwanyoung2/Content

Hwanyoung

Character

BP_HYPlayerCharacController.uassetHY_DefaultInputContext.uasset

InputActions

IA_Interact.uassetIA_ToggleInventory.uassetIA_UseAbility1.uasset

Playables/Haesol

BP_HYController.uassetBP_Haesol.uassetBP_HaesolAttribute.uassetBP_HaesolInitGameplayEffectLevel1.uasset

PlayerCharacter

BP_HYPlayerCharacController.uassetBP_PlayerCharacterBase.uassetHY_DefaultInputContext.uasset

InputActions

IA_Interact.uassetIA_ToggleInventory.uassetIA_UseAbility1.uasset

Playables/Haesol

NewAnimMontage.uasset

Illusions

Assets/Meshes

BP_Gochugaru.uasset

Material

GochugaruSurface1.uassetGochugaruSurface2.uasset

Meat.uassetSalt.uassetSesame.uassetfox_marble.uassetgochugaru.uassetmedicine_bowl.uassetmedicine_pot.uassetstandardSurface1.uassetstandardSurface2.uassetstandardSurface3.uassetstandardSurface4.uassetstandardSurface5.uassetstandardSurface7.uassetstandardSurface8.uasset

GeneralizedBlueprints

AC_CombatSystem.uassetAC_HPSystem.uassetAC_MPSystem.uassetE_AttackStance.uassetE_DamageReactionType.uassetE_DamageType.uassetI_Damagable.uassetI_ManaUser.uassetS_DamageInfo.uasset

UI

BP_InventoryItemSlot.uassetBP_InventoryItemToolTip.uassetBP_InventoryWidget.uasset

KTP_Effect

Maps

Preview_Bottom.umapPreview_Fly.umap

Materials

M_botton01_1.uassetM_botton01_2.uassetM_botton01_3.uassetM_botton01_4.uassetM_botton01_5.uassetM_botton01_6.uassetM_botton01_7.uassetM_botton01_8.uassetM_botton02_1.uassetM_botton02_2.uassetM_botton02_3.uassetM_botton02_4.uassetM_botton02_5.uassetM_botton02_6.uassetM_botton02_7.uassetM_botton02_8.uassetM_botton03_1.uassetM_botton03_2.uassetM_botton03_3.uassetM_botton03_4.uassetM_botton03_5.uassetM_botton03_6.uassetM_botton03_7.uassetM_botton03_8.uassetM_botton04_1.uassetM_botton04_2.uassetM_botton04_3.uassetM_botton04_4.uassetM_botton04_5.uassetM_botton04_6.uassetM_botton04_7.uassetM_botton04_8.uassetM_botton05_1.uassetM_botton05_2.uassetM_botton05_3.uassetM_botton05_4.uassetM_botton05_5.uassetM_botton05_6.uassetM_botton05_7.uassetM_botton05_8.uassetM_botton06_1.uassetM_botton06_2.uassetM_botton06_3.uassetM_botton06_4.uassetM_botton06_5.uassetM_botton06_6.uassetM_botton06_7.uassetM_botton06_8.uassetM_botton07_1.uassetM_botton07_2.uassetM_botton07_3.uassetM_botton07_4.uassetM_botton07_5.uasset

Show More

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/HY_DefaultInputContext.uasset

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/InputActions/IA_Interact.uasset

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/InputActions/IA_ToggleInventory.uasset

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/InputActions/IA_UseAbility1.uasset

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/Playables/Haesol/BP_HYController.uasset

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/Playables/Haesol/BP_Haesol.uasset

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/Playables/Haesol/BP_HaesolAttribute.uasset

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/Playables/Haesol/BP_HaesolInitGameplayEffectLevel1.uasset

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/HY_DefaultInputContext.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/InputActions/IA_Interact.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/InputActions/IA_ToggleInventory.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/InputActions/IA_UseAbility1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/BP_Gochugaru.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) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/BP_InventoryWidget.uasset

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Maps/Preview_Bottom.umap (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Maps/Preview_Fly.umap (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton01_8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton02_8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton03_8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton04_8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton05_8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton06_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton06_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton06_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton06_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton06_5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton06_6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton06_7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton06_8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton07_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton07_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton07_3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton07_4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/KTP_Effect/Materials/M_botton07_5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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