Commit Graph

411 Commits

Author SHA1 Message Date
Andrew_Jr 1c632171ec Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-13 12:49:39 +05:00
Andrew_Jr 240bda3425 Infra window, street name 2023-12-13 12:49:31 +05:00
volhvov ab35db8e0c Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-13 12:43:33 +05:00
volhvov e2b7e5d3ee гп14 2023-12-13 12:43:25 +05:00
Dron 02e24bf7f4 люмен во внешнем туре, ходьба по генплану(но не везде хыхы) поинты ходьбы, тачки обновил, людей и тачек не тпосле полуночи, обновление стриминга левелов 2023-12-13 02:20:06 +05:00
Daniil.I.Y e480ee5a19 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1
# Conflicts:
#	Content/Maps/Cars/Genplan_07_Cars.umap
2023-12-12 18:49:07 +05:00
Daniil.I.Y f267678248 genplan_9 2023-12-12 18:42:38 +05:00
Andrew_Jr f9276c68b4 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-12 18:39:14 +05:00
Andrew_Jr 02c8a33654 New direction 2023-12-12 18:39:02 +05:00
volhvov 2238e8768b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-12 18:20:06 +05:00
volhvov 1665fbd723 арабы теперь ходят на 13 и 8 2023-12-12 18:19:56 +05:00
SergeyVag 3872a50e23 Добавил школу 2023-12-12 18:17:50 +05:00
SergeyVag 0a05c7b514 флаг и бочки на домах 2023-12-12 17:54:47 +05:00
volhvov ec5dd26fe0 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-12 11:43:10 +05:00
volhvov 06e84c809f gp14 2023-12-12 11:43:00 +05:00
Daniil.I.Y 9db34162aa Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-11 20:15:10 +05:00
Daniil.I.Y 75566360ca genplan_9_again 2023-12-11 20:15:05 +05:00
SergeyVag 9e8ee20c21 материалы для Exterior 2023-12-11 20:04:46 +05:00
SergeyVag 795241960a Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-11 18:59:19 +05:00
SergeyVag 6619fec631 хаты правлю 2023-12-11 18:59:16 +05:00
volhvov b116e0e3e3 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-11 18:39:59 +05:00
volhvov d9d0505371 gnpl 13,14 2023-12-11 18:39:47 +05:00
Daniil.I.Y b076598f17 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-11 18:39:19 +05:00
Daniil.I.Y 73fd43b951 genplan_9 2023-12-11 18:39:14 +05:00
SergeyVag 9310b51c44 Генплан 10 2023-12-11 15:39:39 +05:00
SergeyVag 38a1aa9fd6 Говно поправил 2023-12-11 13:58:24 +05:00
Daniil.I.Y 9c826e655b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-09 19:12:35 +05:00
Daniil.I.Y ea99d68a41 genplans_2/5/6/7 2023-12-09 19:12:31 +05:00
SergeyVag 56b9c6d40a Новый Landscape 2023-12-09 18:22:36 +05:00
SergeyVag 84615a7759 Генплан 12 2023-12-08 20:00:49 +05:00
volhvov 4199094bfe Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-07 19:14:37 +05:00
volhvov 1b473e17bf раскидал домики на гплн8, растительность и разметку на 13 2023-12-07 19:14:31 +05:00
SergeyVag 31749913ba Генплан 11 2023-12-07 19:10:32 +05:00
SergeyVag 7ed7fec5e6 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-07 17:40:34 +05:00
SergeyVag eb5fa9cfd7 Генплан_11 2023-12-07 17:40:30 +05:00
Daniil.I.Y cc11f72777 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-07 17:20:38 +05:00
Daniil.I.Y d77b819bfa genplan_6 2023-12-07 17:20:34 +05:00
volhvov eb2c04469b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-07 15:29:39 +05:00
volhvov 51431d84a4 8, 13 genplan 2023-12-07 15:29:36 +05:00
SergeyVag 1155d5a8ff Генплан 11 2023-12-07 14:20:08 +05:00
SergeyVag 508e85637f генплан 11 2023-12-06 16:11:50 +05:00
SergeyVag f6076751c9 всякое 2023-12-06 15:26:36 +05:00
Daniil.I.Y 3f9ba82cfd Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-06 13:58:32 +05:00
Daniil.I.Y fb07f57e35 genplan_6 2023-12-06 13:57:11 +05:00
SergeyVag a66507bcc6 Сделал кулл дистанс на растения 2023-12-06 13:55:11 +05:00
SergeyVag 858a341993 говно удалил 2023-12-05 18:22:39 +05:00
SergeyVag e7f0f684fc х 2023-12-05 17:47:36 +05:00
SergeyVag 0af38747fa Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-05 17:39:39 +05:00
SergeyVag 5238e35f9d Генплан 10 2023-12-05 17:39:33 +05:00
Daniil.I.Y 0d9fffcd2b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-05 17:38:17 +05:00