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

Merge branch 'SJW' into develop

Browse Source 
# Conflicts:
#	Content/Maps/DevMap.umap
This commit is contained in:
HappyTanuki
2023-10-03 22:23:28 +09:00
parent a92d4fe39b 414dc0a422
commit 97f53c735c
18 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Character/Allium/Alium_Q_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_Skill2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_W.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/ABP_Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/AttackCombo.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill3_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill4_2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/BP_Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/BP_Folder/DefaultClass.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/ABP_Lb.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Lb/LB_Bolla_Throw.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Notify/Rotating.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

2
Source/Promether/GameModeBase/Deathmatch.cpp
View File

@@ -133,7 +133,7 @@ FString ADeathmatch::InitNewPlayer(APlayerController* NewPlayerController, const
//DebugPerpose //DebugPerpose
if (Type == CharacterType::Lukriel) if (Type == CharacterType::Lukriel)
{ {
Type = CharacterType::Lb; Type = CharacterType::Allium;
} }
if (Team == TeamType::Null) if (Team == TeamType::Null)
{ {

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

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