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

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Allium/Alium_W.uasset (Stored with Git LFS)
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/Alium_w_debuff.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Aliun_E_Effect.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/Attack1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Allium/Animation/Attack3_Anim.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/Allium/sound/AL_A_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Allium/sound/Al_Q_Boom.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/Animation/R1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/R2_Anim.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/BaseArrow.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/Effect/MP_Toxic Goo.mp3 Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Riana/BP_Riana.uasset (Stored with Git LFS)
View File

Binary file not shown.