A-Rival/Promether
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SJW1024' into HappyTanuki2

Browse Source 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/BaseArrow.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
This commit is contained in:
HappyTanuki
2023-11-13 22:58:56 +09:00
parent 8e4677250e b27742e32f
commit a21c1378f1
424 changed files with 929 additions and 29985 deletions
Download Patch File Download Diff File Expand all files Collapse all files