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

Merge branch 'Peter' into HappyTanuki

Browse Source 
# Conflicts:
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/Animation/ABP_Lb.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Bolla_Throw.uasset
#	Content/Character/Notify/Rotating.uasset
#	Content/Character/Riana/Animation/Skill4_3_Anim.uasset
#	Content/Effect/LB/Arrow/Arrow.uasset
#	Content/Effect/LB/Arrow/Arrow_Flash.uasset
#	Content/Effect/LB/Arrow/Arrow_PhysicsAsset.uasset
#	Content/Effect/LB/LB_Skill/LB_Arrow.uasset
#	Content/Effect/LB/LB_Skill/Q/LB_Q.uasset
#	Content/Effect/LB/LB_Sprint.uasset
#	Content/Maps/DevMap.umap
#	Content/StarterContent/Materials/M_Basic_Floor.uasset
#	Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset
#	Content/StarterContent/Particles/Materials/M_Spark.uasset
#	Content/StarterContent/Particles/Materials/M_radial_ramp.uasset
#	Content/StarterContent/Particles/Materials/m_flare_01.uasset
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
#	Source/Promether/PlayerGeneric/DefaultPlayerController.h
This commit is contained in:
HappyTanuki
2023-10-27 21:50:08 +09:00
parent cf98a38684 9d07b34c06
commit 64a9f38c30
25 changed files with 5 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Effect/ETC/ComeBackHome.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Debuff_Simbol/Cursor_IC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Debuff_Simbol/M_Cursor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Arrow/Arrow.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Arrow/Arrow_Flash.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Arrow/Arrow_PhysicsAsset.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Arrow/Arrow_Skeleton.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Bolla/Bolla_Fx.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Bolla/Bolla_Mt.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Bolla/W_Bolla.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Bolla/W_Bolla_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Bolla/W_Bolla_PhysicsAsset.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/Bolla/W_Bolla_Skeleton.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/LB_Arrow.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/LB_Bolla_Throw.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/LB_Skill/LB_Arrow.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/LB_Skill/Q/LB_Q.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/LB_Sprint.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/LB_TNT_Fire.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/LB_TNT_Spark.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/TNT/TNT_Fire_Nia.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/TNT/TNT_Mesh.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/TNT/TNT_Mt.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/LB/TNT/TNT_Spark.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp
View File

@@ -21,7 +21,7 @@ ADefaultPlayerCharacter::ADefaultPlayerCharacter()
CameraSpringArm = CreateDefaultSubobject<USpringArmComponent>(TEXT("SpringArm"));
CameraSpringArm->SetRelativeLocationAndRotation(FVector(0.0f, 0.0f, 0.0f), FRotator(-45.0f, 0.0f, 0.0f));
CameraSpringArm->SetAbsolute(false, true, true);
CameraSpringArm->TargetArmLength = 1000.f;
CameraSpringArm->TargetArmLength = 2000.f;
CameraSpringArm->bEnableCameraLag = true;
CameraSpringArm->bDoCollisionTest = false;
CameraSpringArm->CameraLagSpeed = 3.0f;