Commit Graph

275 Commits

Author SHA1 Message Date
GRAFF 1ba83ad183 добавил скрывалку, гора интерьеров, конь, залупа, клитор, пень 2023-02-22 00:43:26 +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 4042892835 G2_10 on Zone A, little bit D201 2023-02-21 19:48:09 +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
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
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
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 48da429132 G2 2023-02-20 19:58:14 +05:00
JohnnyHatchet d40e5c3fc1 Zone_G1 2023-02-20 18:57:48 +05:00
DESKTOP-8J0BKKD\Admin 4df6c2c12e Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 18:25:07 +05:00
DESKTOP-8J0BKKD\Admin 9521b6fd9e Правки фасадов по зоне G1 2023-02-20 18:25:04 +05:00
JohnnyHatchet 23960ae69a Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 17:45:48 +05:00
JohnnyHatchet 08e7b0002f D304-2 2023-02-20 17:44:08 +05:00
Igor 88eeaf4869 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 16:31:08 +05:00
Igor 2ddd36ac88 G203 2023-02-20 16:31:04 +05:00
PC-G08 fa3d63aeac G02_11 interior 2023-02-20 16:11:54 +05:00
PC-G12 a66e0053c9 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 15:49:58 +05:00
PC-G12 bfc9274699 222 2023-02-20 15:49:54 +05:00
JohnnyHatchet 65e8731bf1 F25B F36A 2023-02-20 13:36:35 +05:00
FavoredBag 8761c8fab8 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 13:03:18 +05:00
FavoredBag fe475e0b2d F36A F25B 2023-02-20 13:03:13 +05:00
Igor 1519923ac9 G302 2023-02-20 12:34:58 +05:00
DESKTOP-8J0BKKD\Admin 4e52845dca Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-19 14:23:28 +05:00
DESKTOP-8J0BKKD\Admin b0938b9a7d C220_221, Zone_C_G 2023-02-19 14:18:33 +05:00
Igor 1a02078046 G302 2023-02-19 14:18:30 +05:00
Igor b518d8494c Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-19 00:58:38 +05:00
Igor 6e4c3be753 G2_10 2023-02-19 00:58:28 +05:00
JohnnyHatchet ea62dc6463 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-19 00:56:11 +05:00
JohnnyHatchet d9f2b90cea BakeBakeBake 2023-02-19 00:53:52 +05:00
Igor 1d148924e6 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Interior/Zone_G2/G2_10/G2_10.umap
2023-02-18 23:53:19 +05:00
Igor 4f2ccc8bee Запечка всякаяяя 2023-02-18 23:52:25 +05:00
PC-G10 f110d9796e C201_211_215Bake, C207Bake,D304-2Edit,D304-1Edit 2023-02-18 21:27:46 +05:00
Igor c569e0b242 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-18 18:53:53 +05:00
Igor eb79637067 Edit F26 2023-02-18 18:53:48 +05:00
DESKTOP-8J0BKKD\Admin e02e909ee6 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-18 17:34:20 +05:00
DESKTOP-8J0BKKD\Admin 4c3588217c C220_221 2023-02-18 17:34:18 +05:00