Commit Graph

44 Commits

Author SHA1 Message Date
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
2787fd4871 2026-06-12 각종 에셋 포함 2026-06-12 16:24:35 +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
skrwns304@gmail.com
efaea47ae6 2026-06-11 고양이 모델링추가 2026-06-11 18:06:52 +09:00
skrwns304@gmail.com
9f173a4ebc 2026-06-11 사운드시스템 (BaseScene참고) 2026-06-11 15:32:56 +09:00
dldydtn9755-crypto
6a20f521ce Add random room route system 2026-06-11 12:59:56 +09:00
skrwns304@gmail.com
43a80f2df3 2026-06-11 베이스씬 파일정리 2026-06-11 11:28:48 +09:00
skrwns304@gmail.com
376f2e57f6 2026-06-11 베이스씬 구름 제거, 글로벌 오브젝트 구조수정 2026-06-11 11:24:32 +09:00
skrwns304@gmail.com
8e3cc91d92 2026-06-11 기본 매니저 구성 2026-06-11 01:06:48 +09:00
skrwns304@gmail.com
4c955dafc3 2026-06-09 룸 프로토타입 디자인 (진행중) 2026-06-09 20:53:26 +09:00
skrwns304@gmail.com
3a18351d17 2026-06-09 다이얼로그 프로토타입 2026-06-09 16:33:55 +09:00
skrwns304@gmail.com
404921f815 다이얼로그 작업중 2026-06-09 15:51:29 +09:00
4baccd5cbc Initial commit with LFS 2026-06-08 12:39:14 +09:00