Commit Graph

9 Commits

Author SHA1 Message Date
GRAFF 8ad3f1e65a sdfnslfg 2022-03-22 08:48:05 +05:00
GRAFF f4550ff35d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_0.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_1.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_10.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_3.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_6.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_8.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_9.umap
#	Content/Maps/L_Lighting.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/M_Greeds_Inst.uasset
#	Content/Materials/Instances/M_Plastic_RAL_6005.uasset
#	Content/Materials/Instances/M_Plastic_RAL_7026.uasset
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Instances/t_conditioner_grid_Opacity.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_1.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_2.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_3.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/Peoples/Male_01/SM_Male_01_fbm/9_meshes_Merge_Normal.uasset
2022-03-21 11:48:57 +05:00
JohnnyHatchet e713bdd716 Add complex collisions + насыпал тачек на первый план 2022-03-21 00:55:34 +05:00
JohnnyHatchet d9c4c56bb0 Фулл апдейт по фасадам + ОРМка 2022-03-20 18:58:56 +05:00
JohnnyHatchet 6afab6906e Материал на крышу + пристрои 2022-03-20 06:34:27 +05:00
JohnnyHatchet 86b2eac701 New facades S01 S05 2022-03-20 02:06:05 +05:00
GRAFF 58a7df15ae еще пачка всякого, добавил таги, запекатель параллаксов 2022-03-18 16:58:38 +05:00
JohnnyHatchet 1a4f1643b0 Новые фасады + фикс для процедурного меша 2022-03-17 04:26:15 +05:00
JohnnyHatchet 004ebd3b08 Fix all flats + fix fasade 1 2 5 2022-03-15 19:37:03 +05:00