Commit Graph

315 Commits

Author SHA1 Message Date
Igor eb79637067 Edit F26 2023-02-18 18:53:48 +05:00
PC-G10 7102b9db2d Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-18 16:49:06 +05:00
PC-G10 27ddbf6921 F14Bake, Edit F26 2023-02-18 16:49:02 +05:00
Igor cb93cc6592 G302 2023-02-18 15:29:57 +05:00
Igor 8984becb88 F11_G302 2023-02-18 14:11:24 +05:00
PC-G10 a9b239b89e G2_10 2023-02-18 09:33:49 +05:00
GRAFF 253f6a658f ишо интертьеры 2023-02-18 01:01:41 +05:00
GRAFF f39b06bf71 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Interior/Zone_A/A304-2/A304-2_1ST_FL.umap
#	Content/Maps/Interior/Zone_A/A304-2/A304-2_2ND_FL.umap
#	Content/Maps/Interior/Zone_A/A304-2/A304-2_GR_FL.umap
#	Content/Maps/Interior/Zone_A/A304-3/A304-3_F1.umap
#	Content/Maps/Interior/Zone_A/A304-3/A304-3_F2.umap
#	Content/Maps/Interior/Zone_A/A304-4/A304-4_F1.umap
#	Content/Maps/Interior/Zone_A/A304-4/A304-4_F2.umap
#	Content/Maps/Interior/Zone_A/A304-4/A304-4_F3.umap
#	Content/Maps/Interior/Zone_A/A401/A401.umap
#	Content/Maps/Interior/Zone_A/A402/A402.umap
#	Content/Maps/Interior/Zone_A/A406/A406_F1.umap
#	Content/Maps/Interior/Zone_A/A406/A406_F2.umap
#	Content/Maps/Interior/Zone_E_North/E10/E10.umap
2023-02-18 00:31:25 +05:00
GRAFF 6b3abf4adb пачка интерьеров, поинты всякие 2023-02-18 00:28:31 +05:00
JohnnyHatchet 481489dcc3 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-17 20:45:32 +05:00
JohnnyHatchet f371f29bcd biba boba, bake all A_zone,F_zone 2023-02-17 20:42:44 +05:00
Igor 7e81328f48 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-17 20:00:23 +05:00
Igor bdd1d54eeb G302 2023-02-17 20:00:18 +05:00
PC-G12 2b3fb6643e PC_C204 2023-02-17 19:55:21 +05:00
PC-G12 7e627f26dd Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-17 19:12:16 +05:00
PC-G12 4d6f62b200 C 2023-02-17 19:12:06 +05:00
FavoredBag 05e80606e3 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-17 19:06:45 +05:00
FavoredBag 91e64023f4 F25A 2023-02-17 19:06:35 +05:00
PC-G10 ee1a0d5c2c G2_08 2023-02-17 18:15:44 +05:00
PC-G08 0aa9450f90 D304_2 interiors 2023-02-17 17:52:02 +05:00
Igor 494b5ccd30 F08 G302 2023-02-17 17:26:55 +05:00
Igor 7ca6e94f12 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-17 13:14:19 +05:00
Igor 22bb58b6ad F08 2023-02-17 13:14:14 +05:00
DESKTOP-8J0BKKD\Admin 4e09295dfb Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-17 12:56:22 +05:00
DESKTOP-8J0BKKD\Admin 00020e18a1 C219 2023-02-17 12:56:20 +05:00
Andrew a2d40e034c Анимации сборки кораблей 2023-02-17 12:40:43 +05:00
Igor ddd3b6995a Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-16 19:50:30 +05:00
Igor 1d79cda64e F08 2023-02-16 19:50:10 +05:00
PC-G12 406c65e5fe Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-16 19:34:57 +05:00
PC-G12 853b672a3e С 2023-02-16 19:34:27 +05:00
PC-G13 dced627a68 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-16 19:08:05 +05:00
PC-G13 f6aae5096a F24 2023-02-16 19:07:36 +05:00
DESKTOP-8J0BKKD\Admin 85545f1893 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-16 18:11:25 +05:00
DESKTOP-8J0BKKD\Admin 42bbb5ffdc C219 2023-02-16 18:11:20 +05:00
PC-G08 250e12e986 D304_2 interiors 2023-02-16 18:09:51 +05:00
FavoredBag 81007099cc F25B 2023-02-16 14:24:37 +05:00
DESKTOP-8J0BKKD\Admin 71c3379f4f Zona A 2023-02-16 11:54:57 +05:00
JohnnyHatchet cacaba1496 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Zone_A.umap
2023-02-15 20:04:19 +05:00
JohnnyHatchet fdd60e7744 zhopa bol' 2023-02-15 20:02:34 +05:00
Igor 880046bccb Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-15 19:57:28 +05:00
Igor 2a4d98d584 F08 2023-02-15 19:57:23 +05:00
DESKTOP-8J0BKKD\Admin 6aa429cb01 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-15 18:47:10 +05:00
DESKTOP-8J0BKKD\Admin 68807d72e8 правки фасадов по зонам А и Е норч 2023-02-15 18:47:07 +05:00
PC-G08 d2be834fc2 D417 interior 2023-02-15 18:31:18 +05:00
JohnnyHatchet 3c5cf6aef8 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-15 17:39:34 +05:00
JohnnyHatchet ae0e2a52c4 A304-2, A401, A402, A407 2023-02-15 17:36:33 +05:00
DESKTOP-8J0BKKD\Admin 36d5ab4c25 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-15 17:24:51 +05:00
DESKTOP-8J0BKKD\Admin 10d0cfe6ad A411 2023-02-15 17:24:48 +05:00
PC-G08 bae7af2391 D303_G1_1 D303_G1_2 interiors 2023-02-15 17:07:25 +05:00
DESKTOP-8J0BKKD\Admin 62e05de49b Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-15 16:43:58 +05:00