Merge branch 'ForShowcase' into HappyTanuki2

Browse Source

# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/BaseArrow.uasset
#	Content/Character/Lb/EskillBuff.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp

...

This commit is contained in:

HappyTanuki

2023-11-09 20:05:38 +09:00

parent 8eff7f8757 56c68e85d0

commit f085e924bb

22 changed files with 349 additions and 134 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/Effect/AliumQ/Knife1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Effect/CC.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Effect/dust.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Effect/tnt.uasset (Stored with Git LFS) Normal file

Binary file not shown.