554 Commits

Author SHA1 Message Date
Andrew 75d274f82c aboba 2023-02-22 21:01:41 +05:00
GRAFF a79789fcc4 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-22 20:59:09 +05:00
GRAFF 078cc1db7e asd 2023-02-22 20:58:56 +05:00
JohnnyHatchet 73fc6d4848 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-22 20:53:32 +05:00
Andrew fb901f6171 с211 fix 2023-02-22 19:37:37 +05:00
GRAFF ca24b44a38 asd 2023-02-22 19:20:55 +05:00
JohnnyHatchet 84319b4389 ПРавки по ЗАПЕЧКЕЕ И ЦЕХ 2023-02-22 19:03:49 +05:00
JohnnyHatchet 04f556c5b0 Landscape v2 2023-02-22 13:09:12 +05:00
Andrew 13f11152b9 a304 2023-02-22 13:00:07 +05:00
GRAFF d4c7c83af9 asd 2023-02-22 12:54:50 +05:00
Andrew 213e99767e Merge remote-tracking branch 'origin/master' 2023-02-22 12:28:32 +05:00
Andrew 0ae0aa8c82 Пойнты в зоне А, пойнты оборудования в майне 2023-02-22 12:21:36 +05:00
PC-G09 70bb84208e 8k textures fix size 2023-02-22 11:52:41 +05:00
GRAFF 1ba83ad183 добавил скрывалку, гора интерьеров, конь, залупа, клитор, пень 2023-02-22 00:43:26 +05:00
PC-G09 f0a51a8288 Landscape v2 2023-02-21 20:12:42 +05:00
Andrew 7539ffd201 Merge remote-tracking branch 'origin/master' 2023-02-21 20:09:15 +05:00
Andrew 35c2647408 Merge commit '4042892835ee1114fa282b4f3c7439f7bea13110' 2023-02-21 20:08:34 +05:00
Andrew 2e08dcbad4 Пойнты 3д тура в зонах B, C, F, G 2023-02-21 20:08:06 +05:00
JohnnyHatchet 116b20f62a Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 19:49:29 +05:00
JohnnyHatchet 4042892835 G2_10 on Zone A, little bit D201 2023-02-21 19:48:09 +05:00
Andrew d8d351bcff Merge remote-tracking branch 'origin/master' 2023-02-21 18:32:20 +05:00
Andrew 900842abe7 Доп пойнты 2023-02-21 18:31:39 +05:00
GRAFF d6fab44ba5 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Main_Scene.umap
2023-02-21 18:14:30 +05:00
GRAFF 5acf706413 д204 терь как все остальные 2023-02-21 18:14:14 +05:00
Andrew f69bc82b03 Merge remote-tracking branch 'origin/master' 2023-02-21 18:13:20 +05:00
Andrew 9aac9dcdc0 пу пу пу 2023-02-21 18:13:10 +05:00
PC-G12 f24adec8c4 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 17:33:57 +05:00
PC-G12 cafb5f31e2 Benches_C 2023-02-21 17:33:50 +05:00
JohnnyHatchet 12842cade1 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 17:31:04 +05:00
JohnnyHatchet 7a1663c127 F24 2023-02-21 17:26:55 +05:00
GRAFF c7febcd596 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 16:43:19 +05:00
GRAFF 1dcc5c49d7 asd 2023-02-21 16:43:06 +05:00
PC-G12 d7f67fa771 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 16:02:36 +05:00
PC-G12 e84cc50599 с 2023-02-21 16:02:32 +05:00
PC-G13 bd1bc073fd Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Interior/Zone_F/F24/F24_F1.umap
2023-02-21 15:10:51 +05:00
PC-G13 5bc1a2b435 f24 2023-02-21 15:09:53 +05:00
Andrew 9ab9081329 Зона F walkpoint 2023-02-21 14:03:07 +05:00
PC-G12 ac60b30bff Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 13:36:22 +05:00
PC-G12 efffc8ea63 204 2023-02-21 13:36:17 +05:00
Andrew 8ed5ad5fb0 Point anim 2023-02-21 12:36:09 +05:00
GRAFF 2ba15414ac Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Main_Scene.umap
#	Content/Materials/Instance/Metall/Chrome/ColorVariations/MI_Metall_Chrome_Windows.uasset
2023-02-20 20:59:17 +05:00
GRAFF a37be257d4 окна, еще поинты 2023-02-20 20:58:06 +05:00
PC-G12 4f3d566d32 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 20:01:50 +05:00
PC-G12 6be86b650d Bench 2023-02-20 20:01:40 +05:00
JohnnyHatchet d106753a83 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 19:59:59 +05:00
JohnnyHatchet 48da429132 G2 2023-02-20 19:58:14 +05:00
Andrew 947c5780a4 Merge remote-tracking branch 'origin/master' 2023-02-20 19:03:09 +05:00
Andrew c9dc33309a Пойнты для анимаций 2023-02-20 19:02:14 +05:00
JohnnyHatchet d40e5c3fc1 Zone_G1 2023-02-20 18:57:48 +05:00
GRAFF bde4b8199f Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 18:45:32 +05:00