Commit Graph

157 Commits

Author SHA1 Message Date
Nam Tae Gun
3b09252818 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
# Conflicts:
#	Assets/01.Scenes/01.Tycoon 1.unity.meta
2025-01-02 19:57:38 +09:00
NTG_Lenovo
9114e03bf5 4.0.0.1 2025-01-02 18:33:05 +09:00
SweetJJuya
21385cb31b Merge branch 'ntg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into HEAD
# Conflicts:
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-27 05:22:50 +09:00
SweetJJuya
53546c572c Merge branch 'refs/heads/lmg' into HEAD
# Conflicts:
#	Assets/01.Scenes/99.Tycoon_LMG.unity
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-27 05:19:37 +09:00
SweetJJuya
98aa9be66f 0.3.5.25 2024-12-27 05:14:15 +09:00
Nam Tae Gun
616fff8580 0.4.0.0 2024-12-21 02:56:34 +09:00
NTG_Lenovo
78de51a3f7 0.3.5.22 2024-12-19 23:27:01 +09:00
SweetJJuya
ebb5e6c127 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-19 19:21:44 +09:00
SweetJJuya
9369389f4c 0.3.5.21 2024-12-19 19:20:44 +09:00
177800e0fe 홀비주얼 수정1219-2 2024-12-19 02:29:42 +09:00
Nam Tae Gun
bff1e2ce58 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-19 01:00:55 +09:00
Nam Tae Gun
e4a06b8475 0.3.5.20 2024-12-19 01:00:39 +09:00
0d8596ee67 홀비주얼 수정 1219 2024-12-19 00:58:24 +09:00
74631ab062 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into develop 2024-12-17 22:37:42 +09:00
7139a230f4 홀비주얼 수정3 2024-12-17 22:29:25 +09:00
NTG_Lenovo
89ee6c87ba 튜토리얼 작업 중 2024-12-16 21:06:42 +09:00
afea36ff5b 홀비주얼 수정2 2024-12-16 20:35:07 +09:00
Nam Tae Gun
9ce7e946b7 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-12 13:37:15 +09:00
SweetJJuya
3185ba9027 0.3.5.13 2024-12-10 18:56:18 +09:00
NTG_Lenovo
00289190b7 0.3.5.12 2024-12-10 15:49:15 +09:00
Nam Tae Gun
8e7b32d0f0 0.3.5.11 2024-12-06 22:20:10 +09:00
NTG_Lenovo
49321522f6 매뉴얼 북 수정 중 2024-12-05 19:30:41 +09:00
NTG_Lenovo
becad95097 0.3.5.10 2024-12-03 21:30:09 +09:00
NTG_Lenovo
c109087040 0.3.5.9 2024-12-03 18:38:19 +09:00
NTG_Lenovo
2c0fcd5e48 0.3.5.6 2024-12-03 15:08:15 +09:00
NTG_Lenovo
5c2ab045d7 0.3.5.5 2024-12-02 20:43:08 +09:00
SweetJJuya
4d6a7eb32e Temp_Save 2024-12-02 20:28:46 +09:00
Nam Tae Gun
9d4c461d07 0.3.5.0 2024-11-30 20:53:38 +09:00
Nam Tae Gun
b5dc9b0f91 0.3.4.24 2024-11-29 17:34:20 +09:00
Nam Tae Gun
9a70355b61 0.3.4.22 2024-11-29 08:07:50 +09:00
NTG_Lenovo
62a17ed600 결과창 작업중 2024-11-26 20:46:32 +09:00
NTG_Lenovo
c0f227e54b Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-26 17:22:46 +09:00
SweetJJuya
39ff17b22c 0.3.4.18 2024-11-26 17:18:41 +09:00
NTG_Lenovo
3e986edc1a 0.3.4.17 2024-11-25 21:36:48 +09:00
Nam Tae Gun
e969065f7b 0.3.4.16(2) 2024-11-25 10:40:15 +09:00
NTG_Lenovo
afb747cc79 0.3.4.16 2024-11-21 20:05:59 +09:00
SweetJJuya
0b3cb03a9d 0.3.4.13 2024-11-19 22:48:41 +09:00
SweetJJuya
273df8d6ed 0.3.4.11 2024-11-19 21:53:00 +09:00
SweetJJuya
bda714eb94 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/04.Materials/Ink.mat
2024-11-19 16:58:37 +09:00
SweetJJuya
9c064a2f01 0.3.4.9 2024-11-19 16:58:11 +09:00
NTG_Lenovo
0c68cfe87a 0.3.4.8 업데이트 2024-11-19 15:03:43 +09:00
Nam Tae Gun
4d9362fc20 0.3.4.2 업데이트 2024-11-17 23:21:16 +09:00
Nam Tae Gun
d9110b34df 0.3.4.1 업데이트 2024-11-17 13:29:57 +09:00
5b886f8b9d 홀 예시 씬 T45 2024-11-16 02:29:19 +09:00
Nam Tae Gun
57b21c004f 0.3.4.0 2024-11-15 16:28:13 +09:00
SweetJJuya
e35844537f 0.3.3.22 2024-11-12 20:25:00 +09:00
NTG_Lenovo
0af5d8e69f 0.3.3.18 업데이트 2024-11-12 15:58:33 +09:00
NTG_Lenovo
10605c71be 0.3.3.17 업데이트 2024-11-11 21:23:27 +09:00
NTG_Lenovo
ffb6fbc26a 0.3.3.16 2024-11-11 18:51:12 +09:00
NTG_Lenovo
5143cb3bff 0.3.3.11 업데이트 2024-11-11 15:09:32 +09:00