 Maxim
|
3d6da295e1
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Content/Levels/Kamaz_01.umap
# Content/Levels/Kamaz_01_BuiltData.uasset
# Content/Levels/Lights.umap
# Content/Levels/Lights_BuiltData.uasset
|
2019-05-22 16:52:26 +05:00 |
|
|
Maxim
|
af474f1544
|
тесты
|
2019-05-22 16:51:54 +05:00 |
|
 Lenta_Mebiusa
|
a99907fabe
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Content/Levels/Kamaz_01.umap
|
2019-05-22 14:19:43 +05:00 |
|
|
Lenta_Mebiusa
|
a8adba0806
|
Тест
|
2019-05-22 14:19:01 +05:00 |
|
|
Maxim
|
4c820f090d
|
доп
|
2019-05-22 12:47:49 +05:00 |
|
|
Maxim
|
f128c0dbd3
|
Исправлены цвета контейнеров
|
2019-05-22 12:47:11 +05:00 |
|
|
Maxim
|
f599f6ffc6
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Content/Levels/Lights.umap
|
2019-05-22 12:22:37 +05:00 |
|
|
Maxim
|
f4e685b927
|
доп
|
2019-05-22 12:21:59 +05:00 |
|
|
Maxim
|
ea8df16db3
|
Скорректирована иерархия проекта
|
2019-05-22 12:21:29 +05:00 |
|
|
Lenta_Mebiusa
|
7d2d614aa5
|
Тест
|
2019-05-22 12:12:09 +05:00 |
|
|
Lenta_Mebiusa
|
02d7be4282
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
|
2019-05-22 11:27:01 +05:00 |
|
|
Lenta_Mebiusa
|
fae04d4e50
|
Тест
|
2019-05-22 11:26:40 +05:00 |
|
 Zheka3777123
|
f99203d7be
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
|
2019-05-22 11:22:43 +05:00 |
|
|
Zheka3777123
|
8a5d06bf05
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Config/DefaultEngine.ini
|
2019-05-22 11:22:23 +05:00 |
|
|
Maxim
|
3dccaac083
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
|
2019-05-22 11:21:41 +05:00 |
|
|
Zheka3777123
|
9660082912
|
изменил сцену
|
2019-05-22 11:21:21 +05:00 |
|
|
Lenta_Mebiusa
|
2abf0459df
|
Тест
|
2019-05-22 11:02:35 +05:00 |
|
|
Maxim
|
043084c816
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Content/Levels/Lights.umap
|
2019-05-22 10:45:27 +05:00 |
|
|
Maxim
|
658de4a27b
|
доп
|
2019-05-22 10:44:59 +05:00 |
|
|
Zheka3777123
|
e2c1b65bed
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Content/StarterContent/Textures/T_MacroVariation.uasset
|
2019-05-21 18:23:31 +05:00 |
|
|
Zheka3777123
|
916fa4745f
|
добавил птицелова
|
2019-05-21 18:22:39 +05:00 |
|
|
Lenta_Mebiusa
|
8caf493ae9
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
|
2019-05-21 18:03:07 +05:00 |
|
|
Lenta_Mebiusa
|
496fd3d2d4
|
Добавлен контейнер (вариант 3)
|
2019-05-21 18:02:04 +05:00 |
|
|
Maxim
|
7141e7028b
|
доп
|
2019-05-21 12:27:45 +05:00 |
|
|
Maxim
|
6ecb6b3414
|
Настроены материалы ЦОД1 ЦОД2
|
2019-05-21 12:26:37 +05:00 |
|
|
Maxim
|
99c47ffb6e
|
Исправлен материал M_Light
|
2019-05-20 19:10:14 +05:00 |
|
|
Maxim
|
c0225c425d
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
|
2019-05-20 19:04:45 +05:00 |
|
|
Maxim
|
2d022409fc
|
Добавлен ЦОД1 и ЦОД2
|
2019-05-20 19:04:40 +05:00 |
|
|
Maxim
|
9ff381788f
|
Добавлен контейнерный цод 1 и контейнерный цод 2
|
2019-05-20 19:02:47 +05:00 |
|
|
Lenta_Mebiusa
|
82809d3329
|
Исправлена зеркала у камаза
|
2019-05-20 17:52:09 +05:00 |
|
|
Maxim
|
5b87a134f1
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Content/Levels/Lights.umap
|
2019-05-20 17:41:33 +05:00 |
|
|
Maxim
|
edd04b8549
|
доп
|
2019-05-20 17:41:12 +05:00 |
|
|
Maxim
|
28fb6b022b
|
доп
|
2019-05-20 17:39:58 +05:00 |
|
|
Lenta_Mebiusa
|
d77ccb77d1
|
Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
# Content/Levels/Lights.umap
# Content/Materials/M_Glass.uasset
# Content/Materials/M_Light.uasset
# Content/Materials/M_TileClear.uasset
|
2019-05-20 13:06:12 +05:00 |
|
|
Lenta_Mebiusa
|
bdb5e8cc58
|
Добавлены уровни с Мобильным центром обработки данных, Мобильным центром обработки данных на базе прицепа, Контейнерный ЦОД (3 вариант)
|
2019-05-20 13:05:27 +05:00 |
|
|
Maxim
|
e7e380d04f
|
доп
|
2019-05-20 11:30:41 +05:00 |
|
|
Maxim
|
883b7824ad
|
доп
|
2019-05-08 18:29:28 +05:00 |
|
|
Maxim
|
eddbeae01f
|
Добавлено тестовое окружение для цодов в уровень Эра
|
2019-05-08 18:13:42 +05:00 |
|
|
Maxim
|
d8142f5bcf
|
Добавлен ЦОД "Эра"
|
2019-05-08 13:15:10 +05:00 |
|
|
Lenta_Mebiusa
|
76924181f8
|
Иерархия папок
|
2019-04-16 15:10:07 +05:00 |
|
|
Maxim
|
bc1c2a4893
|
Initial commit
|
2019-04-15 15:58:44 +05:00 |
|