|
|
9ad68134c0
|
2026-06-17 나무손 설정
|
2026-06-17 16:10:02 +09:00 |
|
|
|
143cc8a420
|
나무손 플레이어 추가
|
2026-06-17 15:26:15 +09:00 |
|
|
|
5039fafbbf
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-17 13:17:07 +09:00 |
|
|
|
c81a276eba
|
2026-06-17 게임시작 - 고래습격씬 프로토타입
|
2026-06-17 13:17:04 +09:00 |
|
HIHIHIHIHIHIzz
|
809e12bac4
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-17 11:45:12 +09:00 |
|
HIHIHIHIHIHIzz
|
e4120e45fe
|
미로 제작(터레인 활용)
|
2026-06-17 11:44:49 +09:00 |
|
|
|
6ccae390f6
|
2026-06-17 스타터킷,툰셰이더,오른손
|
2026-06-17 10:51:49 +09:00 |
|
|
|
48c3cfe9f1
|
에셋오류?
|
2026-06-17 10:40:35 +09:00 |
|
|
|
65ba4736de
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-17 09:59:12 +09:00 |
|
|
|
7e1ce4171d
|
설정파일 추적중지
|
2026-06-17 09:59:07 +09:00 |
|
|
|
833dd50fa9
|
데모씬 프리팹 오류
|
2026-06-16 23:19:20 +09:00 |
|
|
|
872579e836
|
동굴수수수정
|
2026-06-16 16:49:50 +09:00 |
|
|
|
3899833d36
|
동굴수수정
|
2026-06-16 16:47:57 +09:00 |
|
|
|
3aa3181473
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-16 16:42:01 +09:00 |
|
|
|
35d206038f
|
동굴 수정
|
2026-06-16 16:41:50 +09:00 |
|
HIHIHIHIHIHIzz
|
3f05fd07e1
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-16 16:24:18 +09:00 |
|
HIHIHIHIHIHIzz
|
1ae76e42bf
|
플레이어 프리펩 추가
|
2026-06-16 16:24:12 +09:00 |
|
skrwns304@gmail.com
|
30668c2e16
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-16 15:21:19 +09:00 |
|
skrwns304@gmail.com
|
aa7a3d1146
|
쓰레기파일 제거
|
2026-06-16 15:21:01 +09:00 |
|
HIHIHIHIHIHIzz
|
feea4915a2
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-16 14:39:12 +09:00 |
|
HIHIHIHIHIHIzz
|
56c07ccd65
|
XR오리진 추가
|
2026-06-16 14:36:51 +09:00 |
|
|
|
acc3802bc5
|
Merge pull request '블랙잭 시스템 main 기준 복구' (#6) from feature/hyeonsu-blackjack-clean into main
Reviewed-on: #6
|
2026-06-16 05:19:44 +00:00 |
|
skrwns304@gmail.com
|
256ac3dd56
|
2026-06-16
|
2026-06-16 14:17:09 +09:00 |
|
dldydtn9755-crypto
|
22ead53803
|
블랙잭 시스템 main 기준 복구
|
2026-06-16 13:50:04 +09:00 |
|
skrwns304@gmail.com
|
c92e9f648a
|
Reapply "Merge pull request '리듬게임' (#5) from CatsRhythmGame into main"
This reverts commit d7d5519fbf.
|
2026-06-16 12:26:10 +09:00 |
|
skrwns304@gmail.com
|
d7d5519fbf
|
Revert "Merge pull request '리듬게임' (#5) from CatsRhythmGame into main"
This reverts commit 58385bf819, reversing
changes made to 8369e2ab51.
|
2026-06-16 12:23:32 +09:00 |
|
|
|
58385bf819
|
Merge pull request '리듬게임' (#5) from CatsRhythmGame into main
Reviewed-on: #5
|
2026-06-16 02:09:52 +00:00 |
|
skrwns304@gmail.com
|
53aebbb00e
|
2026-06-16 채보수정
|
2026-06-16 11:05:12 +09:00 |
|
skrwns304@gmail.com
|
e3dada2b79
|
Merge branch 'CatsRhythmGame' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR into CatsRhythmGame
# Conflicts:
# Assets/07_Data/Rhythm/RhythmSong1.asset.meta
|
2026-06-16 10:52:05 +09:00 |
|
skrwns304@gmail.com
|
1d3a457b91
|
2026-06-16 채보수정
|
2026-06-16 10:48:08 +09:00 |
|
|
|
8369e2ab51
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-16 09:47:08 +09:00 |
|
|
|
9962d88bd3
|
동굴 테스트
|
2026-06-16 09:46:59 +09:00 |
|
|
|
38936c211a
|
2026-06-15 리듬게임 자동기능
|
2026-06-15 17:37:32 +09:00 |
|
HIHIHIHIHIHIzz
|
dc0552155e
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
|
2026-06-15 17:33:42 +09:00 |
|
HIHIHIHIHIHIzz
|
88160938b9
|
페어리 추가
|
2026-06-15 17:32:10 +09:00 |
|
|
|
8a82b29da1
|
동굴테스트
|
2026-06-15 16:22:25 +09:00 |
|
skrwns304@gmail.com
|
6fe34d8eec
|
2026-06-15 리듬게임 프로토타입
|
2026-06-15 15:29:54 +09:00 |
|
skrwns304@gmail.com
|
19c26533f8
|
2026-06-14 커스텀 채보
|
2026-06-14 16:03:24 +09:00 |
|
skrwns304@gmail.com
|
fab54e162e
|
2026-06-13 리듬게임 프로토타입
|
2026-06-13 03:24:18 +09:00 |
|
skrwns304@gmail.com
|
e8086180a0
|
2026-06-13 리듬게임 판정
|
2026-06-13 00:16:11 +09:00 |
|
|
|
b0aede20f2
|
2026-06-12 리듬게임 (진행중)
|
2026-06-12 18:20:23 +09:00 |
|
|
|
45a317c812
|
Merge pull request '에셋 포함' (#3) from CatsRhythmGame into main
Reviewed-on: #3
|
2026-06-12 07:28:39 +00:00 |
|
|
|
2787fd4871
|
2026-06-12 각종 에셋 포함
|
2026-06-12 16:24:35 +09:00 |
|
skrwns304@gmail.com
|
915cf6442f
|
Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
# Assets/04_Models/Choice.meta
# Assets/04_Models/Choice/Row.meta
# Assets/04_Models/Choice/Row/ChoiceRow.prefab.meta
|
2026-06-12 15:58:14 +09:00 |
|
skrwns304@gmail.com
|
1e448966a7
|
2026-06-12 충돌?
|
2026-06-12 15:55:26 +09:00 |
|
|
|
1e0483f210
|
2026-06-12 노트생성
|
2026-06-12 14:57:38 +09:00 |
|
|
|
d4a76a2a97
|
remify minigame CatsRhythmGame
|
2026-06-12 13:12:11 +09:00 |
|
|
|
c3210a2a7c
|
2026-06-12 블랙잭 마테리얼 수정, 나무스틱 모델
|
2026-06-12 10:45:54 +09:00 |
|
dldydtn9755-crypto
|
4ea96d4774
|
블랙잭 씬 및 카드 게임 구성
|
2026-06-12 10:31:45 +09:00 |
|
skrwns304@gmail.com
|
ca88395a1a
|
2026-06-12 고양이 마테리얼, 양동이 모델
|
2026-06-12 00:31:30 +09:00 |
|
