Merge branch 'SJW1024' into develop

Browse Source

# Conflicts:
#	Content/Maps/DevMap.umap

...

This commit is contained in:

HappyTanuki

2023-10-21 23:14:00 +09:00

parent 7340756d96 5ad7df473b

commit ef12cf0dbd

41 changed files with 467 additions and 423 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/BP_Allium.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Content/Character/Lb/Animation/Treasure_Attack1_Anim.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/EskillBuff.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Content/Character/Riana/Animation/ABP_Riana.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Content/Character/Riana/Animation/Skill4_3_Anim.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Riana/BP_Riana.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Effect/ETC/Burning.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Content/InputActions/InputMappingContext.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/InputActions/ObjectSelect.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/InputActions/Skill4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/InputActions/Skill4_End.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Maps/Untitled.umap (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Content/StarterContent/Materials/M_Basic_Floor.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/StarterContent/Particles/Materials/M_radial_ramp.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/StarterContent/Particles/Materials/m_flare_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/UI/NameBar_UI/Hp_UI.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/UI/NameBar_UI/NameBar_UI.uasset (Stored with Git LFS) Normal file

Binary file not shown.