Maxim/COD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73 Commits 2 Branches 0 Tags
ff05ba7e2a198ddfdecf44807f77328ac8c66eee
Commit Graph

73 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxim ff05ba7e2a Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD 
# Conflicts:
#	Content/Materials/Material_Instances/MI_Glass_1.uasset
 2019-06-03 17:05:29 +05:00
Maxim 6e8f41e4b6 добавил стойки с анимацией 2019-06-03 17:00:46 +05:00
Dron 2000abd624 Добавил функцию прозрачности 2019-06-03 14:20:53 +05:00
Dron 0bc5b401e2 Merge branch 'master' into develop 
# Conflicts:
#	Content/Materials/M_TileClear.uasset
 2019-06-03 14:13:55 +05:00
Dron 99ee444562 xkty 2019-06-03 14:10:12 +05:00
Zheka3777123 53de820760 Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD 
# Conflicts:
#	Content/Levels/Container_03.umap
 2019-06-03 13:57:30 +05:00
Zheka3777123 04f62ed9b5 обновил камаз 2019-06-03 13:57:03 +05:00
Dron 1b951b1bdb кончился день 2019-05-31 20:06:31 +05:00
Dron 2f29da1bcd вот и день закончился 2019-05-30 22:10:27 +05:00
Dron 1167ca1d86 Merge branch 'master' into develop 2019-05-29 21:12:34 +05:00
Dron 1f1c69926c хуй 2019-05-29 21:03:28 +05:00
Dron e5d5dfb898 Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD 
# Conflicts:
#	Content/Levels/Container_03.umap
 2019-05-29 20:56:40 +05:00
Dron 147e113040 еще 2019-05-29 20:51:04 +05:00
Dron d4fd2bfb66 всякие добавки 2019-05-29 20:49:16 +05:00
Dron 0dfa982c93 еще 2019-05-29 20:46:22 +05:00
Maxim c65c786509 Добавлены ассеты для цодов 2019-05-29 15:31:02 +05:00
Dron aea5587399 еще 2019-05-29 14:57:40 +05:00
Maxim e51cd15ccb Удалены лишние материалы 2019-05-29 12:54:36 +05:00
Maxim dd162c1b83 Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD 2019-05-29 12:50:43 +05:00
Maxim 95ac865c6e доп 2019-05-29 12:50:38 +05:00
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
Maxim 68184fb4ba Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD 
# Conflicts:
#	Content/Materials/M_TileClear.uasset
#	Content/Materials/Material_Instances/MI_СontainerBlue.uasset
 2019-05-29 12:38:45 +05:00
Maxim b14e309f18 доп 2019-05-29 12:38:15 +05:00
Dron 87dd4b6eca добавки 2019-05-28 21:27:34 +05:00
Dron 0e2e464344 обновки 2019-05-27 14:22:58 +05:00
Dron 5d4f20a124 заебало 2019-05-23 21:15:35 +05:00
Dron 64da6e94d6 настройка, добавление всякой херни 2019-05-23 21:13:31 +05:00
Maxim bf4e3cff46 Востановлены материалы в цод Эра 2019-05-23 10:41:15 +05:00
Dron ddcc18a74c добавление прозрачности в мастер материал 2019-05-22 20:46:24 +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 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