Commit Graph

97 Commits

Author SHA1 Message Date
HIHIHIHIHIHIzz
f443c4a4de Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-19 15:36:15 +09:00
HIHIHIHIHIHIzz
9838b6701d 문어추가, 해산물 에셋 많이 추가 2026-06-19 15:36:09 +09:00
d6dd90ed4b Merge pull request '블랙잭 NPC 코인 및 AI Navigation 기능 추가' (#7) from feature/hyeonsu-blackjack-restore into main
Reviewed-on: #7
2026-06-19 06:35:40 +00:00
dldydtn9755-crypto
3d0432ebd4 블랙잭 NPC 코인 및 AI Navigation 기능 추가 2026-06-19 15:24:19 +09:00
skrwns304@gmail.com
b1e85a5b89 2026-06-19 UI, UI로직 2026-06-19 14:27:40 +09:00
skrwns304@gmail.com
b751a9ed66 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
2026-06-19 12:00:54 +09:00
skrwns304@gmail.com
72728250e9 ?? 2026-06-19 11:51:12 +09:00
790e958b0a Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-19 11:48:55 +09:00
06976e2883 동굴데코 2026-06-19 11:48:49 +09:00
27d56d582e Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-18 18:09:15 +09:00
f69d0ef273 2026-06-18 앉기 UI등등 2026-06-18 18:09:08 +09:00
1d77570015 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-18 17:47:47 +09:00
f7cd7cbe18 동굴재건 2026-06-18 17:47:41 +09:00
HIHIHIHIHIHIzz
0fe592ffb4 그냥 이펙트 모델만 놨어요 2026-06-18 17:30:17 +09:00
HIHIHIHIHIHIzz
b41c7c33f7 저장(?) 2026-06-18 17:14:21 +09:00
HIHIHIHIHIHIzz
728837b3a7 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-18 17:09:13 +09:00
HIHIHIHIHIHIzz
8026a5be80 up 2026-06-18 17:09:07 +09:00
HIHIHIHIHIHIzz
76c3cb7171 하늘만 바꿈. 하늘 에셋 머터리알 폴더에 추가(큐브맵, 머터리알 스카이박스) 2026-06-18 17:08:01 +09:00
83b3c4a27c 2026-06-18 리듬게임 자동스틱 2026-06-18 16:26:40 +09:00
1cbd9ac094 2026-06-18 자동관련 2026-06-18 15:50:22 +09:00
55add41bfb Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-18 15:33:50 +09:00
f2de341701 뗏목노브삭제 2026-06-18 15:33:44 +09:00
67c2b2c179 2026-06-18 많은 플레이어 수정사항 2026-06-18 15:07:21 +09:00
dff151c5f0 2026-06-18 손 누락사항 2026-06-18 11:31:43 +09:00
eadd16b433 2026-06-18 고양이룸 터레인 수정 2026-06-18 11:13:08 +09:00
241a9b2bee Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-17 19:06:16 +09:00
997c1affbe 2026-06-17 highlight 에셋추가. 스틱그랩 추가중 2026-06-17 19:06:09 +09:00
HIHIHIHIHIHIzz
a0cf31a3a2 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR 2026-06-17 17:46:55 +09:00
HIHIHIHIHIHIzz
a16caea803 협곡미로 완성! 조명이랑 이펙트 추가할거임. 2026-06-17 17:46:50 +09:00
b162d9fcc7 2026-06-17 오류 수정 2026-06-17 17:42:52 +09:00
4710a0da95 2026-06-17 2026-06-17 16:43:33 +09:00
9ad68134c0 2026-06-17 나무손 설정 2026-06-17 16:10:02 +09:00
143cc8a420 나무손 플레이어 추가 2026-06-17 15:26:15 +09:00
HIHIHIHIHIHIzz
a4a3f371e0 낙준님이 래프트핸드 프리펩을 만드셨다! 2026-06-17 14:44:28 +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