Attempt merge fix without reverting animation BP changes

This commit is contained in:
Alan O'Cull 2024-02-06 13:29:34 -05:00
commit 179a5c59a6
21 changed files with 48 additions and 24 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Blueprints/Player/Msc/Skills/Struct_AxeSpin.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Player/Msc/Skills/Struct_AxeThrow.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Blueprints/Player/Msc/Skills/Struct_Grapple.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Player/Msc/Skills/Struct_Melee.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Sounds/VFX/SC_Explosion.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Sounds/VFX/SW_Explosion.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/UI/SkillTree/WB_SkillMenu.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/UI/SkillTree/WB_SkillTree.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.