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

Browse Source

...

This commit is contained in:

benroshio 2024-07-14 18:49:31 -04:00

parent 0e509e4937 f55937e63c

commit 119362de63

73 changed files with 69 additions and 168 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/PlayerCharacter

BP_PlayerCharacterBase.uasset

Input/InputActions

IA_BlockAttack.uasset

Playables/Haesol

Animations

BP_AnimHaesolHwando.uassetBP_AnimHaesolMelee.uassetBP_HaesolBlendSpace.uassetBP_HaesolBlockHold.uassetBP_HaesolDefenseReact.uassetBP_PhysAttackMeleeHaesol.uassetNewBlendSpace.uasset

Sequences

Anim_Hwando_Defense_React_Soldier.uassetAnim_Hwando_Defense_React_Weapon.uassetAnim_Hwando_Hold_Defense_Soldier.uassetAnim_Hwando_Hold_Defense_Weapon.uasset

BP_Haesol.uasset

Illusions/GeneralizedBlueprints

AC_AttributeSystem.uassetAC_CombatSystem.uassetAC_HPSystem.uassetBP_AoEBase.uassetE_BlockingState.uassetI_Damagable.uasset

UI

BP_InventoryHUDWidget.uassetBP_InventoryItemSlot.uassetBP_InventoryItemToolTip.uasset

KoreanTraditionalMartialArts

Animations

Fist

Anim_Fist_Attack1.uassetAnim_Fist_Attack2.uassetAnim_Fist_Attack3.uassetAnim_Fist_Attack4.uassetAnim_Fist_Damage.uassetAnim_Fist_Defense.uassetAnim_Fist_Die.uassetAnim_Fist_Idle1.uassetAnim_Fist_Idle2.uassetAnim_Fist_Run.uassetAnim_Fist_Walk.uassetAnim_Fist_WalkLeft.uassetAnim_Fist_WalkRight.uassetAnim_Fist_Walkback.uasset

Hwando

Anim_Hwando_Attack1_Soldier.uassetAnim_Hwando_Attack2_Soldier.uassetAnim_Hwando_Damage_Soldier.uassetAnim_Hwando_Defense_Soldier.uasset

Nangseon

Anim_Nangseon_Attack1_Soldier.uassetAnim_Nangseon_Attack1_Weapon.uassetAnim_Nangseon_Attack2_Soldier.uassetAnim_Nangseon_Attack2_Weapon.uassetAnim_Nangseon_Attack3_Soldier.uassetAnim_Nangseon_Attack3_Weapon.uassetAnim_Nangseon_Attack4_Soldier.uassetAnim_Nangseon_Attack4_Weapon.uassetAnim_Nangseon_Damage_Soldier.uassetAnim_Nangseon_Damage_Weapon.uassetAnim_Nangseon_Defense_Soldier.uassetAnim_Nangseon_Defense_Weapon.uassetAnim_Nangseon_Die_Soldier.uassetAnim_Nangseon_Die_Weapon.uassetAnim_Nangseon_Idle1_Soldier.uassetAnim_Nangseon_Idle1_Weapon.uassetAnim_Nangseon_Idle2_Soldier.uassetAnim_Nangseon_Idle2_Weapon.uassetAnim_Nangseon_Run_Soldier.uassetAnim_Nangseon_Run_Weapon.uassetAnim_Nangseon_WalkBack_Soldier.uassetAnim_Nangseon_WalkBack_Weapon.uassetAnim_Nangseon_WalkLeft_Soldier.uassetAnim_Nangseon_WalkLeft_Weapon.uassetAnim_Nangseon_WalkRight_Soldier.uassetAnim_Nangseon_WalkRight_Weapon.uassetAnim_Nangseon_Walk_Soldier.uassetAnim_Nangseon_Walk_Weapon.uasset

Map

Overview.umap

Meshs/Characters/Meshs

SKEL_Soldier_1.uassetSKM_Soldier_1.uasset

NewPreviewMeshCollection.uasset

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_BlockAttack.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) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Hwando_Hold_Defense_Weapon.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/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/BP_AoEBase.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

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/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/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Attack1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Attack2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Attack3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Attack4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Damage.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Defense.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Die.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Idle1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Idle2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Run.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Walk.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_WalkLeft.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_WalkRight.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Fist/Anim_Fist_Walkback.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack1_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack2_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Damage_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Defense_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Attack1_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Attack1_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Attack2_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Attack2_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Attack3_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Attack3_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Attack4_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Attack4_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Damage_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Damage_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Defense_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Defense_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Die_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Die_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Idle1_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Idle1_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Idle2_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Idle2_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Run_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Run_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_WalkBack_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_WalkBack_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_WalkLeft_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_WalkLeft_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_WalkRight_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_WalkRight_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Walk_Soldier.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Nangseon/Anim_Nangseon_Walk_Weapon.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KoreanTraditionalMartialArts/Map/Overview.umap (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/NewPreviewMeshCollection.uasset (Stored with Git LFS) Normal file

Binary file not shown.