Commit Graph

143 Commits

Author SHA1 Message Date
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
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
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
PC-G10 27ddbf6921 F14Bake, Edit F26 2023-02-18 16:49:02 +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
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
Igor 494b5ccd30 F08 G302 2023-02-17 17:26:55 +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
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 ee92390a37 F25B Facade 2023-02-16 15:49:13 +05:00
FavoredBag e19c5a79b6 F25A Facade 2023-02-16 15:48:32 +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
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
Igor c31a36c188 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-15 17:03:32 +05:00
Igor 84d2420770 F08 2023-02-15 17:03:26 +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
DESKTOP-8J0BKKD\Admin f352e1f4d1 A406 2023-02-15 16:43:56 +05:00
Igor 61f26e8d47 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-15 16:38:21 +05:00