Merge branch 'HappyTanuki2' into SJW1024

Browse Source

# Conflicts:
#	Content/Character/Allium/Alium_Q.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Q_Arrow.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/GameModeBase/Deathmatch.cpp

...

This commit is contained in:

HappyTanuki

2023-11-14 02:27:19 +09:00

parent 334064270f db63221d3d

commit 24932cdd2b

20 changed files with 297 additions and 84 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/ETC/Hit_Nomal.uasset (Stored with Git LFS)

Binary file not shown.