Zheka3777123/URA
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
266 Commits 4 Branches 0 Tags
690118ada022f60fbc92f369ecaaa76da78cffda
Commit Graph

90 Commits

Author SHA1 Message Date
DMITRY2000 328fa0df83 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
 2019-11-29 11:18:54 +05:00
DMITRY2000 ee1f6af795 Дома дома 2019-11-29 11:13:14 +05:00
Lenta_Mebiusa 25f3f2a976 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
 2019-11-28 15:18:31 +05:00
Lenta_Mebiusa 8735cfecd2 Добавлена часть людей и детей, обновлены детские площадки у садика 2019-11-28 15:14:48 +05:00
Zheka3777123 f0c90c8c83 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/New_S2F1/S2F1.umap
#	Content/Level/New_S3F1/S3F1.umap
 2019-11-28 13:27:42 +05:00
Zheka3777123 495c6e6e9d мебель 2019-11-27 16:23:28 +05:00
Zheka3777123 e2dc1e36ba Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/S2F1.umap
#	Content/Level/S2F1/S2F1.umap
 2019-11-25 17:25:54 +05:00
Zheka3777123 7edb641e0d расставлял мебель 2019-11-25 17:24:59 +05:00
Dron 3e0b035b59 тут чтото делали 2019-11-25 16:21:30 +05:00
Zheka3777123 406da8dd78 настроил лоды 2019-11-22 20:14:59 +05:00
Zheka3777123 cc80a0f43b добавил моп 2019-11-22 14:35:04 +05:00
Zheka3777123 c33ffad38f Стены S2F2 и S3F2 2019-11-18 18:50:41 +05:00
Dron 9ef77f5f2a начал переделки 2019-11-06 14:30:05 +05:00
Dron 9e8e30772d Обновления последние, пропитанные гневом и желчью 2019-10-30 14:32:27 +05:00
Zheka3777123 e8aa8f801d Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Building1.umap
#	Content/Level/Building_2.umap
#	Content/Level/Building_3.umap
#	Content/Level/Index.umap
 2019-10-28 22:04:46 +05:00
Zheka3777123 6bcfed71c7 настроил материалы стен 2019-10-28 22:04:29 +05:00
Dron 4bfbeafa25 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/AssetPacks/Flowers_Plants_Part1/Meshes/SM_CornusAlba_01_FoliageType.uasset
#	Content/AssetPacks/Flowers_Plants_Part1/Meshes/SM_Hosta_06_FoliageType.uasset
#	Content/AssetPacks/TreePackBeech/Grass/SM_grassBasic_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_B_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_D_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_H_FoliageType.uasset
#	Content/AssetPacks/TreePackPine/StaticMeshes/Grass/SM_grassLong_FoliageType.uasset
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/MAF.umap
#	Content/Level/S2F1.umap
 2019-10-28 20:23:33 +05:00
Dron 69f00daa76 kasdkkasd 2019-10-28 20:22:14 +05:00
AndreiZaitsev 13e480afd8 добавил ТП 2019-10-28 19:03:06 +05:00
Lenta_Mebiusa e8229425ba Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/AssetPacks/Flowers_Plants_Part1/Meshes/SM_Hosta_06_FoliageType.uasset
#	Content/AssetPacks/TreePackBeech/Grass/SM_grassBasic_FoliageType.uasset
#	Content/AssetPacks/TreePackPine/StaticMeshes/Grass/SM_grassLong_FoliageType.uasset
#	Content/Instances/Fabric/MI_Fabric_22.uasset
 2019-10-28 18:58:41 +05:00
Lenta_Mebiusa ee3e0cbfb2 Удалил выступающую траву. Убрал коллизии 2019-10-28 18:58:03 +05:00
Zheka3777123 0c3c47b379 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-28 18:45:55 +05:00
Zheka3777123 61f086148e даскрасил стены первый этаж 2019-10-28 18:45:52 +05:00
Dron ca2d090b58 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/AssetPacks/Au_Bedroom_03/Mesh/Props/SM_TV.uasset
#	Content/AssetPacks/Flowers_Plants_Part1/Meshes/SM_CornusAlba_01_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_B_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_D_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_H_FoliageType.uasset
#	Content/Blueprints/BP_Elevator_OTIS.uasset
#	Content/Level/Building1.umap
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/Lights.umap
#	Content/Level/MAF.umap
#	Content/Level/S2F1.umap
#	Content/Level/S2F2.umap
#	Content/Level/reflections.umap
#	Content/Materials/M_FakeInterior.uasset
 2019-10-28 18:08:57 +05:00
Dron c7ad21aa0b всякое 2019-10-28 18:06:44 +05:00
Zheka3777123 a643317977 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Instances/Fabric/MI_Fabric_22.uasset
 2019-10-28 17:01:12 +05:00
Zheka3777123 be5de27d91 раскрасил стены 2019-10-28 17:00:50 +05:00
AndreiZaitsev aaf3f3e785 Флаг, стелла, пристрой первого дома 2019-10-28 15:20:34 +05:00
Dron c0c3c30243 триллион правок 2019-10-28 00:20:34 +05:00
Zheka3777123 afe63deac5 раскрасил домики 2019-10-27 17:02:04 +05:00
Zheka3777123 b48588e09e Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
 2019-10-27 16:24:06 +05:00
Zheka3777123 c6b2a7e75a добавил домики 2019-10-27 16:23:43 +05:00
IVAAAN db6defe9b0 Заборчики у мафов, вентиляшки, дороги окружения, перекрасил площадки в садике, подписи улиц 2019-10-27 13:59:44 +05:00
AndreiZaitsev 87d10ed223 Дома, дома, дома 2019-10-27 04:34:15 +05:00
AndreiZaitsev aa4784994a Допилка 3го дома 2019-10-26 21:25:35 +05:00
AndreiZaitsev f1c739b326 Настройка текстур дома 2019-10-26 16:45:06 +05:00
Maxim 1e6d1f34d6 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/S3F1.umap
 2019-10-25 21:47:32 +05:00
Maxim 02c1eb7b97 текстуры 2019-10-25 21:46:02 +05:00
Zheka3777123 78f326c321 добавил материал плитки 2019-10-25 19:59:10 +05:00
Lenta_Mebiusa 2e70657156 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/Lights.umap
 2019-10-25 18:44:59 +05:00
Lenta_Mebiusa 51dff98d6a Нанес разметку на парковки. Изменил цвет бехатона. Разделил меш спортивных площадок для Димы 2019-10-25 18:43:31 +05:00
AndreiZaitsev 689eb2cc44 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Building_3.umap
#	Content/Level/Lights.umap
 2019-10-25 17:49:47 +05:00
AndreiZaitsev 12dde15389 Поправил развертку 2019-10-25 17:49:09 +05:00
Zheka3777123 257a51d969 изменил расклатку плитки 2019-10-25 17:41:33 +05:00
Zheka3777123 1ad6b4c1d9 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-25 15:27:19 +05:00
Zheka3777123 e12796a179 добавил мебель в S2F2 2019-10-25 15:27:11 +05:00
Dron 671e61b1ae Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-25 15:22:05 +05:00
Dron e900687de9 всякая кака 2019-10-25 15:20:56 +05:00
IVAAAN 015cc43b2a Добавил большое футбольное поле и обставил школьную территорию 2019-10-25 14:04:32 +05:00
Maxim d811422b1e текстуры 2019-10-25 11:34:21 +05:00