 Zheka3777123
|
04f62ed9b5
|
обновил камаз
|
2019-06-03 13:57:03 +05:00 |
|
 Maxim
|
95ac865c6e
|
доп
|
2019-05-29 12:50:38 +05:00 |
|
|
Maxim
|
bf4e3cff46
|
Востановлены материалы в цод Эра
|
2019-05-23 10:41:15 +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
|
ea8df16db3
|
Скорректирована иерархия проекта
|
2019-05-22 12:21:29 +05:00 |
|
|
Maxim
|
9ff381788f
|
Добавлен контейнерный цод 1 и контейнерный цод 2
|
2019-05-20 19:02:47 +05:00 |
|
|
Maxim
|
eddbeae01f
|
Добавлено тестовое окружение для цодов в уровень Эра
|
2019-05-08 18:13:42 +05:00 |
|
|
Maxim
|
d8142f5bcf
|
Добавлен ЦОД "Эра"
|
2019-05-08 13:15:10 +05:00 |
|