Commit Graph

149 Commits

Author SHA1 Message Date
EgorSuv d03a2ce422 Bake_AtriumE01_F02 2022-10-31 18:10:47 +05:00
GRAFF 1bcf5fa5d3 расставил всякий кал, скрыл завод, и вверстал анимацию 2022-10-31 14:20:19 +05:00
Andrew 1e049367b1 Merge remote-tracking branch 'origin/master' 2022-10-31 03:39:36 +05:00
Andrew 36d7d2b9c0 D204 Пойнты 2022-10-31 03:39:24 +05:00
JohnnyHatchet 11b6a707dc Генплан у Е-01 2022-10-31 03:36:20 +05:00
Andrew a52500fbd8 Merge remote-tracking branch 'origin/master' 2022-10-31 02:41:13 +05:00
Andrew 18afb26183 Готовая анимашка сборки установки 2022-10-31 02:40:51 +05:00
PC-G04 e6b5555104 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-10-31 01:59:47 +05:00
PC-G04 a94ce66f92 Atrium_E01 2022-10-31 01:59:36 +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
Andrew 045b877ab8 Merge remote-tracking branch 'origin/master' 2022-10-30 22:23:19 +05:00
Andrew b2681b020b Анимашка гребанной установки 2022-10-30 22:22:53 +05:00
EgorSuv fe63deecd8 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-10-30 22:08:46 +05:00
EgorSuv d791d0712a Zapechka_E01_GF_1STFL_2ND_FL 2022-10-30 22:08:18 +05:00
PC-G10 b22a55f3dd D204 2022-10-30 17:29:07 +05:00
EgorSuv 043445204b Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-10-30 14:26:04 +05:00
EgorSuv ba1d32ba85 bruh 2022-10-30 14:23:18 +05:00
PC-G04 0ee5b9d5d5 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-10-30 14:15:44 +05:00
PC-G04 f4680f4aad E01_1ST_FL_Interier 2022-10-30 14:15:37 +05:00
PC-G08 b221819df9 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-10-29 14:51:50 +05:00
PC-G08 14d2e061ef E01_2ND_FL 2022-10-29 14:51:40 +05:00
EgorSuv aceb4d509d E01_Lightmap_egor 2022-10-29 12:32:31 +05:00
PC-G04 3a9883005f Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-10-28 22:39:23 +05:00
PC-G04 5e707526e7 Ground_floor_E01 2022-10-28 22:39:17 +05:00
AndreiZaitsev 9c6a55a8a0 E01_first_floor_interier 2022-10-28 19:27:05 +05:00
PC-G04 9a4bfdbe93 E01_Doors_lamps 2022-10-28 18:45:05 +05:00
PC-G04 a0068cd850 E01_Furniture 2022-10-28 13:23:41 +05:00
PC-G04 f6ee24a685 E01_Interier 2022-10-28 12:44:44 +05:00
GRAFF 3053092053 охуеть ну вроде готово 2022-10-26 18:41:35 +05:00
GRAFF 673749c98c SUKA 2022-10-26 16:22:55 +05:00
GRAFF 6a862f4165 остались мелочи 2022-10-26 02:38:20 +05:00
GRAFF 9914c5aa76 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Main_Scene.umap
#	Content/Materials/Instance/Emissive/Simple/MI_Emissive_for_BP.uasset
#	Content/Materials/Interior/F2/Fabric/MI_Fabric_biege1.uasset
#	Content/Materials/Interior/F2/Fabric/MI_Fabric_white.uasset
#	Content/Materials/Interior/F2/Fabric/MI_Leather_black.uasset
#	Content/Materials/Interior/F2/Fabric/MI_Velvet_fabric_blue.uasset
#	Content/Materials/Interior/F2/MI_Painted_biege_wood.uasset
#	Content/Materials/Interior/F2/MI_Painted_black_metal.uasset
#	Content/Materials/Interior/F2/MI_Painted_white_wood.uasset
#	Content/Materials/Interior/F2/MI_Painted_yellow_concrete.uasset
#	Content/Materials/Interior/F2/MI_Wall_white.uasset
#	Content/Materials/Interior/F2/Tiles/MI_Ceiling_gypsum_tile.uasset
#	Content/Materials/Interior/F2/Tiles/MI_Terazzo_hall_floor.uasset
#	Content/Materials/Interior/F2/Tiles/MI_Tile_Biedge_Bathroom.uasset
#	Content/Materials/Interior/F2/Tiles/MI_Tile_light_marble_floor.uasset
#	Content/Materials/Interior/F2/Uniq/MI_InfoTableExitLighting_HalonFireExtinguisher.uasset
#	Content/Materials/Interior/F2/Wood/MIBlack_wood.uasset
#	Content/Materials/Interior/F2/Wood/MI_Dark_wood.uasset
2022-10-25 19:46:38 +05:00
GRAFF cd6321d2b2 fasadHide, интерфейс, ходилка, плеер 2022-10-25 19:43:07 +05:00
EgorSuv 95b6b1a0e7 Furniture_Ezone 2022-10-25 19:30:00 +05:00
EgorSuv cc7b4510b1 BuildInterier_F2 2022-10-25 18:36:18 +05:00
EgorSuv 336e8de38b Bake_light_F2_egorrr 2022-10-25 13:13:03 +05:00
PC-G04 5c8e383727 F2_All_FL 2022-10-24 18:48:52 +05:00
PC-G04 23589c67fa F02_GF0 2022-10-23 16:32:33 +05:00
PC-G04 bdd8d3b947 f2fur 2022-10-22 15:58:39 +05:00
GRAFF 2d2dcc81b9 sadasd 2022-09-28 14:23:42 +05:00
JohnnyHatchet a6ddd4f1fa Pravki huyavki + razmetka 2022-09-28 06:30:14 +05:00
Andrew 632ab0e2b1 Вернул удаленные пойнты 2022-09-27 22:25:55 +05:00
GRAFF 6082d6d055 да заебался я уже пилить эту хуету! 2022-09-27 21:50:49 +05:00
GRAFF 8d0f16dedf скрыл декаль дорог, по зонам терь ок 2022-09-27 20:45:58 +05:00
GRAFF 2552839402 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-09-27 20:16:08 +05:00
JohnnyHatchet c42a3bf202 Корабли в разборе + вышки 2022-09-27 18:47:28 +05:00
GRAFF 9d1601499c Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Main_Scene.umap
2022-09-27 14:34:31 +05:00