Commit Graph

18 Commits

Author SHA1 Message Date
33bad1f50a Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/My project/Fonts/Pretendard-Black SDF.asset
2026-06-22 17:04:21 +09:00
74afff5be8 육지도착 2026-06-22 16:58:32 +09:00
HIHIHIHIHIHIzz
5bd8dd771c 스테이징된 변경사항(950개)라고 되어있어서 그냥 커밋 한번 더 했어요. 2026-06-22 16:43:50 +09:00
HIHIHIHIHIHIzz
d12a45ad29 헤엄치는 고래별, 움직이는 해산물 2026-06-22 16:22:10 +09:00
3575022478 2026-06-22 캐릭터 영역별 스크립트 2026-06-22 12:57:29 +09:00
ab18ef19f5 Merge pull request '게이트 이동 시스템 추가 및 기존 이동 매니저 정리' (#8) from feature/hyeonsu-gate into main
Reviewed-on: #8
2026-06-22 02:36:25 +00:00
dldydtn9755-crypto
6fc20431e8 게이트 이동 시스템 추가 및 기존 이동 매니저 정리 2026-06-22 11:28:53 +09:00
49f99647a1 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:
#	Assets/RealToon.meta
#	Assets/RealToon/Editor.meta
#	Assets/RealToon/RealToon Shaders.meta
#	Assets/RealToon/RealToon Shaders/RealToon Core.meta
#	Assets/RealToon/RealToon Shaders/RealToon Core/URP.meta
#	Assets/RealToon/RealToon Shaders/RealToon Core/URP/Pass.meta
#	Assets/RealToon/RealToon Shaders/Version 5.meta
#	Assets/RealToon/RealToon Shaders/Version 5/URP.meta
#	Assets/RealToon/RealToon Shaders/Version 5/URP/Default.meta
#	Assets/RealToon/RealToon Tools.meta
#	Assets/RealToon/RealToon Tools/FrameByFrameRendering.meta
2026-06-20 16:56:52 +09:00
295e284dd0 2026-06-20 뉴페어리 2026-06-20 16:46:29 +09:00
dldydtn9755-crypto
3d0432ebd4 블랙잭 NPC 코인 및 AI Navigation 기능 추가 2026-06-19 15:24:19 +09:00
67c2b2c179 2026-06-18 많은 플레이어 수정사항 2026-06-18 15:07:21 +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
skrwns304@gmail.com
6fe34d8eec 2026-06-15 리듬게임 프로토타입 2026-06-15 15:29:54 +09:00
dldydtn9755-crypto
6a20f521ce Add random room route system 2026-06-11 12:59:56 +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
4baccd5cbc Initial commit with LFS 2026-06-08 12:39:14 +09:00