|
|
a21c1378f1
|
Merge branch 'SJW1024' into HappyTanuki2
# 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
|
2023-11-13 22:58:56 +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 |
|
|
|
1cd43f4527
|
저장
|
2023-11-09 22:51:12 +09:00 |
|
SJW1024
|
27a20d9573
|
작업 전 최신화
|
2023-11-09 20:13:59 +09:00 |
|
|
|
f085e924bb
|
Merge branch 'ForShowcase' into HappyTanuki2
# Conflicts:
# Content/Blueprints/BP_DefaultPlayerCharacter.uasset
# Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
# Content/Character/Lb/BP_Lb.uasset
# Content/Character/Lb/BaseArrow.uasset
# Content/Character/Lb/EskillBuff.uasset
# Content/Maps/DevMap.umap
# Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
|
2023-11-09 20:05:38 +09:00 |
|
SJW1024
|
8eff7f8757
|
123345
|
2023-11-07 23:26:47 +09:00 |
|
SJW1024
|
08c70b5df3
|
파운드 스킬구현 1차 완
|
2023-10-27 01:19:16 +09:00 |
|
|
|
053c56f37c
|
호-밍 공격 및 선택 시스템 구현
|
2023-10-25 02:40:51 +09:00 |
|
SJW1024
|
9f1e6e5d5d
|
Ap/Ad 구분 완
|
2023-10-24 01:44:07 +09:00 |
|
SJW1024
|
3d59b3d336
|
이펙트 다운로드, 평타 수정중
|
2023-10-24 01:26:08 +09:00 |
|
SJW1024
|
19d7095a43
|
재업
|
2023-10-23 00:52:39 +09:00 |
|
SJW1024
|
d64a725306
|
캐릭터 애니메이션 통제(특정 행동 도중 스킬/이동/공격 불가 설정), 평타 알고리즘 완성
|
2023-10-22 22:44:14 +09:00 |
|
|
|
727478c286
|
bug fix
|
2023-10-22 01:58:42 +09:00 |
|
|
|
c3e1bb932d
|
머지 및 버그픽스 대충 완료
|
2023-10-22 00:43:43 +09:00 |
|