Commit Graph

4 Commits

Author SHA1 Message Date
Maxim c15b2c8bf5 Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD
# Conflicts:
#	Content/Blueprints/Assets/BP_Server600x1200x2101.uasset
#	Content/Blueprints/Assets/BP_Server800x1200x2100.uasset
#	Content/Materials/M_Glass.uasset
#	Content/Materials/M_TileClear.uasset
#	Content/Materials/Material_Instances/MI_Glass_1.uasset
2019-06-05 15:50:11 +05:00
Maxim 9d9fe70e50 получаю 2019-06-05 15:49:34 +05:00
Zheka3777123 2b06a062ec настроил материалы 2019-06-05 15:10:38 +05:00
Maxim c65c786509 Добавлены ассеты для цодов 2019-05-29 15:31:02 +05:00