10 Commits

Author SHA1 Message Date
Dron 696235d180 далее 2019-06-22 17:52:48 +05:00
Zheka3777123 e69c814813 настроил запечения 2019-06-07 18:21:44 +05:00
Zheka3777123 2b06a062ec настроил материалы 2019-06-05 15:10:38 +05:00
Maxim 95ac865c6e доп 2019-05-29 12:50:38 +05:00
Zheka3777123 0e95397be5 Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
#	Content/Levels/Container_03.umap
#	Content/Levels/Era.umap
#	Content/Levels/Era_BuiltData.uasset
#	Content/Levels/Kamaz_01.umap
#	Content/Levels/Lights.umap
#	Content/Levels/Lights_BuiltData.uasset
#	Content/Levels/Pritsep.umap
#	Content/Levels/Сontainer_01.umap
#	Content/Levels/Сontainer_02.umap
#	Content/Materials/M_scene_test.uasset
#	Content/Meshes/Container_2/SM_ContainerBackWall_2.uasset
#	Content/Meshes/Container_2/SM_ContainerBase_2.uasset
#	Content/Meshes/Container_2/SM_ContainerRoof_2.uasset
#	Content/Meshes/Era/SM_Ferm.uasset
#	Content/Meshes/Era/SM_Foundation.uasset
#	Content/Meshes/Era/SM_FrozenTubes.uasset
#	Content/Meshes/Era/SM_Label.uasset
#	Content/Meshes/Era/SM_RoofFans.uasset
#	Content/Meshes/Era/SM_Roof_1.uasset
#	Content/Meshes/Era/SM_Roof_2.uasset
#	Content/Meshes/Era/SM_Stair_1.uasset
#	Content/Meshes/Era/SM_Stair_2.uasset
#	Content/Meshes/Era/SM_Stair_3.uasset
#	Content/Meshes/Era/SM_Stair_4.uasset
#	Content/Meshes/Era/SM_Tank.uasset
#	Content/Meshes/Era/SM_Walls.uasset
#	Content/Meshes/Сontainer_1/SM_ContainerBackWall.uasset
#	Content/Meshes/Сontainer_1/SM_ContainerBase.uasset
#	Content/Meshes/Сontainer_1/SM_ContainerRoof.uasset
#	Content/Meshes/Сontainer_1/SM_Foundation.uasset
#	Content/Meshes/Сontainer_1/SM_MiniFan.uasset
#	Content/Meshes/Сontainer_1/SM_RoofFans2.uasset
2019-05-22 17:13:01 +05:00
Zheka3777123 36d8fb1961 запечение 2019-05-22 17:09:40 +05:00
Maxim f128c0dbd3 Исправлены цвета контейнеров 2019-05-22 12:47:11 +05:00
Maxim ea8df16db3 Скорректирована иерархия проекта 2019-05-22 12:21:29 +05:00
Maxim 6ecb6b3414 Настроены материалы ЦОД1 ЦОД2 2019-05-21 12:26:37 +05:00
Maxim 9ff381788f Добавлен контейнерный цод 1 и контейнерный цод 2 2019-05-20 19:02:47 +05:00