Commit Graph

8 Commits

Author SHA1 Message Date
SJW1024
d6c58e8c15 Merge remote-tracking branch 'origin/ssasin' into SJW1024
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/Bp_DefaultplayerController.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Bolla_Throw.uasset
#	Content/Character/Lb/Lb_RskillBurst.uasset
#	Content/Character/Lb/Lb_WskillDebuff.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
2023-11-15 04:14:43 +09:00
SJW1024
b27742e32f 복구 2023-11-13 22:37:54 +09:00
SJW1024
9a6fc93fa1 삭제 2023-11-13 22:35:11 +09:00
SJW1024
4c3356ffc2 파운드 100%, 알리움 대상 지정 제외 전체 완성 2023-11-13 06:53:58 +09:00
SJW1024
8eff7f8757 123345 2023-11-07 23:26:47 +09:00
SJW1024
08c70b5df3 파운드 스킬구현 1차 완 2023-10-27 01:19:16 +09:00
727478c286 bug fix 2023-10-22 01:58:42 +09:00
c3e1bb932d 머지 및 버그픽스 대충 완료 2023-10-22 00:43:43 +09:00