|
|
a21c1378f1
|
Merge branch 'SJW1024' into HappyTanuki2
# 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
|
2023-11-13 22:58:56 +09:00 |
|
