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

Browse Source

...

This commit is contained in:

benroshio

2024-08-07 19:21:17 -04:00

parent d8fed1510e 8bd822a6c6

commit 4e40a39b55

326 changed files with 904 additions and 79 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_PlayerCharacterBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

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/Character/PlayerCharacter/Playables/Haesol/BP_HaesolHwando.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_CombatSystem.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.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/AOEBP/BP_AOEBase.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.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_ManualPickUpItemBase.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/MPSystem/I_ManaUser.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/Inventory_HUD/BP_InventoryHUDWidget.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemSlot.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/Player_HUD/WG_PlayerHUD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKM_Soldier_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Pillar_50x500.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/SM_AssetPlatform.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x200.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x300.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_400x400.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_500x500.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Door_400x300.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Door_400x400.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Window_400x300.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Architecture/Wall_Window_400x400.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Collapse_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Explosion_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire01_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire_Sparks01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Fire_Sparks01_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light01_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Light02_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Smoke01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Smoke01_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Background_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Birds01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Music01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Music_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Wind05.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Starter_Wind06.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Steam01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Audio/Steam01_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/FogBrightnessLUT.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/M_LightStage_Arrows.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Black.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_HDRI.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Master.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/SM_Arrows.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/Skybox.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/Assets/SunlightColorLUT.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/StarterContent/Blueprints/BP_LightStudio.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