Merge remote-tracking branch 'origin/ssasin' into SJW1024

Browse Source

# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/Bp_DefaultplayerController.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Bolla_Throw.uasset
#	Content/Character/Lb/Lb_RskillBurst.uasset
#	Content/Character/Lb/Lb_WskillDebuff.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap

...

This commit is contained in:

SJW1024

2023-11-15 04:14:43 +09:00

parent 8276b4f3f0

commit d6c58e8c15

21 changed files with 59 additions and 8 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.