Merge branch 'HappyTanuki' into SJW1024

Browse Source

# Conflicts:
#	Content/Character/BP_Folder/DefaultClass.uasset
#	Content/Character/Lb/Animation/ABP_Lb.uasset
#	Content/Character/Lb/Animation/R2_Anim.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
#	Source/Promether/PlayerGeneric/DefaultPlayerController.h

...

This commit is contained in:

HappyTanuki

2023-10-10 20:53:38 +09:00

parent 64d92be895 ae124e49f0

commit 39e95c5cf8

14 changed files with 227 additions and 384 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/BP_Folder/DefaultClass.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Lb/Animation/R2_Anim.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Character/Lb/BP_Lb.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Maps/DevMap.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/Maps/Untitled.umap (Stored with Git LFS)

Binary file not shown.