Zakhar #1

Merged
dddushesss merged 6 commits from Zakhar into Prod 2021-12-30 17:01:03 +00:00

6 Commits

Author SHA1 Message Date
dddushesss
ec9b0b8e17
Merge branch 'Prod' into Zakhar 2021-12-30 20:00:57 +03:00
dddushesss
1977ae6d7c minor fixes 2021-12-30 19:57:59 +03:00
dddushesss
6bb16f8757 Отрезание 2021-12-29 21:11:12 +03:00
DyatelO
296a5384c6 Поиск пути. 2021-12-29 20:02:01 +03:00
DyatelO
15a734b2b4 Merge branch 'Prod' into Zakhar
# Conflicts:
#	Assets/Resources/1/MK/MKToon/Examples/Textures/Watermelon/Watermelon.png
#	Assets/Resources/1/MK/MKToon/Examples/Textures/Watermelon/WatermelonNormal.png
2021-12-29 16:15:32 +03:00
DyatelO
6b6feb2d9c no message 2021-12-29 16:13:23 +03:00