Merge branch 'SJW' into develop

Browse Source

# Conflicts:
#	Content/Maps/DevMap.umap

...

This commit is contained in:

HappyTanuki

2023-10-03 22:23:28 +09:00

parent a92d4fe39b 414dc0a422

commit 97f53c735c

18 changed files with 39 additions and 24 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

Content/Character/Allium/Alium_Q_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Character/Allium/Alium_Skill2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Character/Allium/Alium_W.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Character/Allium/Animation/ABP_Allium.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Allium/Animation/AttackCombo.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Allium/Animation/Skill1_Anim.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Allium/Animation/Skill2_Anim.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Allium/Animation/Skill3_Anim.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Allium/Animation/Skill4_2_Anim.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Allium/BP_Allium.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/BP_Folder/DefaultClass.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Character/Lb/Animation/ABP_Lb.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Lb/BP_Lb.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Lb/LB_Bolla_Throw.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Character/Notify/Rotating.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Effect/LB/Bolla_Throw.uasset (Stored with Git LFS)

Binary file not shown.