Commit Graph

24 Commits

Author SHA1 Message Date
39e95c5cf8 Merge branch 'HappyTanuki' into SJW1024
# Conflicts:
#	Content/Character/BP_Folder/DefaultClass.uasset
#	Content/Character/Lb/Animation/ABP_Lb.uasset
#	Content/Character/Lb/Animation/R2_Anim.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
#	Source/Promether/PlayerGeneric/DefaultPlayerController.h
2023-10-10 20:53:38 +09:00
ae124e49f0 타이먼 기반 땜빵 코딩 2023-10-08 18:59:33 +09:00
69852b9541 스탯이 이제 stats와 동기화됩니다. 2023-10-08 05:12:55 +09:00
52e4c37ee5 코드 정리 + stats FName구현체 2023-10-08 04:45:12 +09:00
SJW1024
64d92be895 리아나 전체 모션 및 파운드 궁극기 모션 삽입 2023-10-07 22:26:53 +09:00
deef14d8b5 이상한 맵 삭제 및 abp 구조 수정 2023-10-07 20:45:53 +09:00
326ae353d3 회전방향 동기화 2023-10-07 20:13:01 +09:00
ssasin3801
ad46469f9f 리아나 궁극기 애니메이션 분할완료 2023-10-04 21:19:09 +09:00
df7878c687 블루프린트 컴파일 오류 해결 2023-10-03 22:26:30 +09:00
97f53c735c Merge branch 'SJW' into develop
# Conflicts:
#	Content/Maps/DevMap.umap
2023-10-03 22:23:28 +09:00
a92d4fe39b Merge branch 'ssasin' into develop
# Conflicts:
#	Content/Maps/DevMap.umap
2023-10-03 22:12:59 +09:00
abde170fb7 Merge branch 'HappyTanuki' into develop 2023-10-03 22:12:39 +09:00
SJW1024
414dc0a422 파운드, 알리움 스킬 모션 구현(최종) 2023-10-03 22:00:29 +09:00
fcbc476c82 Merge remote-tracking branch 'origin/ssasin' into develop
# Conflicts:
#	Content/Maps/DevMap.umap
2023-10-03 21:41:24 +09:00
c0662902b6 Merge branch 'HappyTanuki' into develop 2023-10-03 21:41:12 +09:00
3156e85925 저장 2023-10-03 21:16:58 +09:00
97e13694dd 저장 2023-10-03 00:36:50 +09:00
ssasin3801
14bddd6a48 어택모션1,2
리젠1
강공2,3
워킹
2023-10-02 00:05:11 +09:00
ssasin3801
9612a82924 골렘 모델링, 애니메이션 (idel), 텍스쳐 2023-09-26 04:20:06 +09:00
536a3d587b Merge branch 'Peter' into develop 2023-09-26 01:51:46 +09:00
406979ad0c Merge branch 'SJW' into develop 2023-09-26 01:50:20 +09:00
aa427465a9 민석씨 파일 복구 2023-09-26 01:28:56 +09:00
263563d5c7 준우파일 복구 2023-09-26 01:26:02 +09:00
ba9171056c Initial commit 2023-09-25 23:01:30 +09:00