Commit Graph

27 Commits

Author SHA1 Message Date
GRAFF a0618fa4a2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Blueprints/Lamp/BP_spotlight.uasset
#	Content/Blueprints/Lamp/BP_spotlight_1.uasset
#	Content/Blueprints/Lamp/BP_spotlight_egg.uasset
#	Content/Blueprints/Lamp/BP_spotlight_sphere.uasset
#	Content/Blueprints/Lamp/BP_spotlight_xiaomi.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_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_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/MI_Brick_01.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset
2022-03-17 17:05:24 +05:00
GRAFF 407047409d куча барахла еще 2022-03-17 17:00:50 +05:00
PC-G06 e9c02dc03b Plintus_WallPicture_Hookan 2022-03-17 16:58:07 +05:00
JohnnyHatchet 1a4f1643b0 Новые фасады + фикс для процедурного меша 2022-03-17 04:26:15 +05:00
Igor f0ca2332e4 Dom1_flat_1,2,5 2022-03-16 18:43:32 +05:00
PC-G06 ff5da097be Door_Mesh_And_Mat 2022-03-16 18:37:43 +05:00
PC-G04 7a7a88f6d3 dom_1_flat_4_Interior 2022-03-16 18:22:12 +05:00
PC-G06 8cad594926 Dom_1_Flat_All 2022-03-15 19:33:01 +05:00
PC-G04 acbd747dbe dom_1_f4 2022-03-15 19:18:55 +05:00
PC-G03 83deecc734 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
2022-03-15 19:14:54 +05:00
PC-G03 3fe002b8af d_1_F3 2022-03-15 19:14:14 +05:00
Igor deb182ad67 dom_1_F1_F2_F5 2022-03-15 19:04:52 +05:00
PC-G06 14ed31d2a2 BP_Light_intensity_and_Door 2022-03-15 17:20:08 +05:00
GRAFF 82abd78661 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-14 17:18:41 +05:00
GRAFF 15f0b60364 куча хлама 2022-03-14 17:18:24 +05:00
PC-G06 1c44097bd6 Lamp_Mesh 2022-03-14 16:35:59 +05:00
PC-G06 5b99f9a6d9 Eclectic_Material_Part_2 2022-03-11 17:43:14 +05:00
PC-G06 2f4f6fbc3e Dom_1_Flat_0 2022-03-10 17:51:42 +05:00
PC-G06 787fdd0689 Eclectic_Material_Part_1 2022-03-10 17:18:07 +05:00
GRAFF 8315f32314 куча изменений в интерфейсе, ИИ для люда, обновление лицензии 2022-02-17 13:51:23 +05:00
GRAFF 0f6c4c0be2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_6028.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset
2022-01-31 18:07:39 +05:00
PC-G09 6666f2da0e Outside + interior lvls 2022-01-28 17:59:48 +05:00
GRAFF e876ddece9 куча всякого, встроил управление по хттп, новый интерфейс, новая защита 2022-01-20 13:39:25 +05:00
GRAFF 21dfaf79d1 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-01-10 17:11:41 +05:00
PC-G09 2d0976c8bd Add floors 2022-01-10 15:58:44 +05:00
GRAFF 54f6561b7d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Materials/Instances/NewMaterial_day_good.uasset
#	Content/Meshes/water.uasset
2021-12-21 13:34:40 +05:00
GRAFF 0d8781d6aa защита, подвижки всякие 2021-12-17 21:41:07 +05:00