Commit Graph

70 Commits

Author SHA1 Message Date
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
PC-G04 5e707526e7 Ground_floor_E01 2022-10-28 22:39:17 +05:00
PC-G04 f6ee24a685 E01_Interier 2022-10-28 12:44:44 +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
JohnnyHatchet d7d5c3c464 Доп подсветка G + фикс E South 2022-09-27 13:57:12 +05:00
JohnnyHatchet 4576f1501c Декаль на дороги (перенес ее с мейна в лендскейп, скорее всего дубликат будет (с мейна снести в таком случае)) 2022-09-27 09:22:35 +05:00
JohnnyHatchet 96cac2d973 Cum 2022-09-27 06:13:21 +05:00
GRAFF 325da0577f Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-09-27 05:50:58 +05:00
JohnnyHatchet 0a2d262da1 Жилая зона F 2022-09-27 04:57:36 +05:00
GRAFF 2c1da63de0 ,kznm f 2022-09-27 04:40:41 +05:00
JohnnyHatchet e324ff2e94 Laserbeams - CHECK! 2022-09-27 03:33:06 +05:00
JohnnyHatchet 5399014743 На вентелятор 2022-09-26 23:32:16 +05:00
JohnnyHatchet e69aecae76 Говно на вентелятор 2022-09-26 16:22:11 +05:00
JohnnyHatchet 5e08fd617d Подкрутил материал (Грязб снизу + песок сверху по баунду меша градиентом), начал раскидывать маты 2022-09-26 08:34:42 +05:00
JohnnyHatchet 32f001df86 Томный вечер воскресенья 2022-09-26 00:09:05 +05:00
GRAFF 98036f848e Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2022-09-25 21:41:21 +05:00
JohnnyHatchet 6dd5e74c5b Всякое 2022-09-25 21:31:23 +05:00
GRAFF f56c4814f6 дебаг поиска 2022-09-25 21:25:05 +05:00
JohnnyHatchet abef0677b1 Генераторы + навесы 2022-09-25 01:49:43 +05:00