Commit Graph

150 Commits

Author SHA1 Message Date
6347d94b35 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-22 14:02:32 +09:00
c4d9227966 스카이 박스 수정 2026-07-22 14:02:28 +09:00
efed53af18 임시 베이킹 2026-07-22 13:09:07 +09:00
15eeb9d469 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-22 10:15:03 +09:00
60f9a992ae 반영안함 2026-07-22 10:14:55 +09:00
9d1500ac7b Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-21 21:22:18 +09:00
0703f5fae0 라이팅 임시저장 2026-07-21 21:22:12 +09:00
dldydtn9755-crypto
0f0e6c6f63 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-21 16:59:10 +09:00
dldydtn9755-crypto
df5839f78d 다이얼로그 완성 2026-07-21 16:57:02 +09:00
789f9d5de7 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-21 16:07:54 +09:00
264b169006 마지막 씬 베이킹 2026-07-21 16:07:11 +09:00
1aacaa854c 쉐이더 2026-07-21 15:52:20 +09:00
aa7f107747 매터리얼 고치기 2026-07-21 15:51:00 +09:00
dldydtn9755-crypto
18f496e503 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-21 13:10:28 +09:00
dldydtn9755-crypto
4491741ce2 dd 2026-07-21 13:10:04 +09:00
9284a63aac 페스티벌씬 에셋오류 수정 2026-07-21 13:05:05 +09:00
dldydtn9755-crypto
4f60232566 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-21 09:50:45 +09:00
dldydtn9755-crypto
e29c9071fe no message 2026-07-21 09:50:22 +09:00
f1d468d0ef 챕터2 나머지 완료 2026-07-20 19:37:27 +09:00
dldydtn9755-crypto
57d6cdfd80 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-20 18:14:48 +09:00
dldydtn9755-crypto
94287ee19d 벽쿵 완성본 2026-07-20 18:13:49 +09:00
50be43de93 챕터2 유나루트 완료 2026-07-20 18:12:43 +09:00
dldydtn9755-crypto
a4e92d57fb Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-20 12:46:28 +09:00
dldydtn9755-crypto
aeb328f9db no message 2026-07-20 12:42:04 +09:00
9e4a5ac143 파티클 수정 2026-07-20 12:25:42 +09:00
d835ddb21e 유나 드래곤폼 추가중 2026-07-17 18:09:45 +09:00
0a319f5906 2챕터 윤지후 루트 및 버그 수정 2026-07-17 15:56:18 +09:00
dldydtn9755-crypto
4ebd1d3ac3 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-17 14:40:56 +09:00
512c55c63b 2챕터 윤지후져 루트 2026-07-17 14:35:36 +09:00
dldydtn9755-crypto
a9f5df1430 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-17 14:22:44 +09:00
dldydtn9755-crypto
b273af18e9 2 2026-07-17 14:20:28 +09:00
fc06825972 물품들 상호작용 달기 2026-07-17 12:45:12 +09:00
ad6ccadc8e 대화중에 아웃라인 안뜨게 2026-07-17 11:57:19 +09:00
ecfd2d7f47 UI 깊이 버퍼 변경 2026-07-17 11:48:57 +09:00
ef66cd22e7 행사용품들 에셋 2026-07-17 10:53:44 +09:00
69f3b0a6d3 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-16 18:08:03 +09:00
1bf813a8dd 창고 꾸미는중 2026-07-16 18:07:15 +09:00
d1babb74e2 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-16 18:03:32 +09:00
ffec2f1f3f 행복한순간이야해피데이 2026-07-16 17:59:28 +09:00
dldydtn9755-crypto
8e4b825957 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-16 17:57:32 +09:00
dldydtn9755-crypto
f1948452b6 131 2026-07-16 17:50:41 +09:00
dldydtn9755-crypto
7d8e1a62dc Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-16 16:37:00 +09:00
dldydtn9755-crypto
b67d6e5f56 도서관 현재 2026-07-16 16:35:13 +09:00
963efde33e Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-16 16:34:22 +09:00
454adce428 챕터 1,2 라이팅맵 2026-07-16 16:30:58 +09:00
7aa008cd1a Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-16 12:15:39 +09:00
736edbce0f 이제는웃는거야스마일어게인 2026-07-16 12:12:03 +09:00
dldydtn9755-crypto
83fee62720 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-15 17:59:15 +09:00
c2216b0756 챕터2 구준표루스 루트 2026-07-15 17:58:28 +09:00
dldydtn9755-crypto
965e5911d9 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-15 17:56:04 +09:00