 Zheka3777123
|
36ac10d85c
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Content/Levels/Container_03.umap
# Content/Levels/Era.umap
# Content/Levels/Kamaz_01.umap
# Content/Levels/Lights.umap
# Content/Materials/M_RealHole.uasset
# Content/Materials/M_scene_test.uasset
# Content/Materials/Material_Instance/MI_Scene_Era.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
|
2019-05-29 12:46:42 +05:00 |
|
|
Zheka3777123
|
102fec3c71
|
добавил забор
|
2019-05-29 12:43:59 +05:00 |
|
 Dron
|
ddcc18a74c
|
добавление прозрачности в мастер материал
|
2019-05-22 20:46:24 +05:00 |
|
 Maxim
|
4c820f090d
|
доп
|
2019-05-22 12:47:49 +05:00 |
|
|
Maxim
|
f4e685b927
|
доп
|
2019-05-22 12:21:59 +05:00 |
|
|
Maxim
|
ea8df16db3
|
Скорректирована иерархия проекта
|
2019-05-22 12:21:29 +05:00 |
|