Commit Graph

97 Commits

Author SHA1 Message Date
Igor 4f2ccc8bee Запечка всякаяяя 2023-02-18 23:52:25 +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
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
Andrew a2d40e034c Анимации сборки кораблей 2023-02-17 12:40:43 +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-G08 250e12e986 D304_2 interiors 2023-02-16 18:09:51 +05:00
Igor 2a4d98d584 F08 2023-02-15 19:57:23 +05:00
PC-G08 26290421b4 F09 F18 inta 2023-02-14 17:44:07 +05:00
FavoredBag 73c4ddafb6 F13 2023-02-14 16:48:10 +05:00
JohnnyHatchet 5e8ffec8ed Bake_Irina 2023-02-13 20:04:54 +05:00
JohnnyHatchet 25550963fa IRINA 2023-02-11 13:41:27 +05:00
GRAFF 1a2eeb8450 фикс хероты с нормалями при повороте лвла, еще гора фиксов, правка поитнтов и полоджения капмеры 2023-02-11 01:38:34 +05:00
PC-G12 8a70bbf3fa Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-10 19:54:04 +05:00
PC-G12 f15981c9aa ZoneC 2023-02-10 19:53:59 +05:00
GRAFF 6749a27b35 туры вкрячены 2023-02-10 19:01:05 +05:00
DESKTOP-8J0BKKD\Admin 86b633ad12 E08 2023-02-10 12:10:24 +05:00
PC-G08 d158248d91 F01 interior 2023-02-09 17:24:00 +05:00
FavoredBag bc19fa2f6d F26 2023-02-09 12:43:41 +05:00
JohnnyHatchet 5cdb6f832d Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-08 20:09:36 +05:00
JohnnyHatchet 4633d803c2 A218 2023-02-08 20:06:25 +05:00
PC-G08 aecc6300ef F01 interiors 2023-02-08 19:39:47 +05:00
PC-G12 9b3d1c2620 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-08 15:23:39 +05:00
PC-G12 5160c71de0 ZoneC201_202 2023-02-08 15:23:31 +05:00
JohnnyHatchet 38780023b3 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-07 20:11:10 +05:00
JohnnyHatchet 1466bfaf16 Zone_A 2023-02-07 20:09:23 +05:00
Igor ceef793d3d Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-07 20:05:20 +05:00
Igor 59c37c1403 E_01_SM_SOP055 2023-02-07 20:05:15 +05:00
PC-G08 2ecbf7e200 F14 2023-02-07 18:42:46 +05:00
JohnnyHatchet 5277052396 Zone_E 2023-02-06 17:38:59 +05:00
JohnnyHatchet cd324f0464 Zone_E, Zone_B 2023-02-05 20:51:04 +05:00
JohnnyHatchet 295e7a6b42 lamp 2023-02-03 19:50:03 +05:00
JohnnyHatchet 8bc9880990 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-03 17:56:12 +05:00
JohnnyHatchet 20bb065e17 Zone_A, Zone_B 2023-02-03 17:47:35 +05:00
DESKTOP-8J0BKKD\Admin a51594c3dc Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-03 15:19:26 +05:00
DESKTOP-8J0BKKD\Admin cf83ab9d6c Zone E, E05 2023-02-03 15:19:21 +05:00
Igor cbd5c32a71 F_05 2023-02-03 11:48:44 +05:00
JohnnyHatchet 11c9352ec4 Asset Office
Zone A,B
2023-01-25 16:54:22 +05:00
JohnnyHatchet 2e8b4d218c D310-1_D310-2 2023-01-24 16:26:29 +05:00
JohnnyHatchet 9d01171d57 InteriersA302,B303
Ready assets
Config raytrace ON
2023-01-16 20:19:16 +05:00
JohnnyHatchet 808426cc51 A302 2023-01-11 20:19:20 +05:00
GRAFF 1bcf5fa5d3 расставил всякий кал, скрыл завод, и вверстал анимацию 2022-10-31 14:20:19 +05:00
PC-G10 ff7a47135e всякое с матами для анимации 2022-10-31 00:15:59 +05:00
JohnnyHatchet b1f778ba16 Платформа 2022-10-30 23:36:54 +05:00
JohnnyHatchet 8e29a653cb E-01 LODs 2022-10-30 22:49:20 +05:00
JohnnyHatchet c8bda65314 E-01 Fasade 2022-10-30 22:30:16 +05:00
PC-G10 b22a55f3dd D204 2022-10-30 17:29:07 +05:00