Zheka3777123/URA
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
434 Commits 4 Branches 0 Tags
cpp
Commit Graph

434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dron 27c44856c4 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/S2F1.umap
#	Content/Meshes/Building_3/SM_Bld4_Annex.uasset
 2019-10-28 22:30:58 +05:00
Dron e7bc7bef19 ууу блеть 2019-10-28 22:30:34 +05:00
Zheka3777123 edd3d61c2b правка уровней 2019-10-28 22:23:33 +05:00
Zheka3777123 632f01bf1f флаг 2019-10-28 22:09:37 +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
Zheka3777123 51f21ff73e поправил лайтмапу 2019-10-28 19:47:35 +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
Lenta_Mebiusa 9783435390 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-28 17:51:22 +05:00
Lenta_Mebiusa df272330b8 Добавил деревья, кусты, лавки, названия улиц, авто, id на крышах паркингов 2019-10-28 17:50:52 +05:00
AndreiZaitsev 3dec6d334c Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-28 17:49:41 +05:00
AndreiZaitsev 93af700ee6 крыши 2019-10-28 17:49:16 +05:00
Zheka3777123 744c95a549 поправил телики 2019-10-28 17:27:45 +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
Zheka3777123 a97f5f1750 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
 2019-10-28 09:35:33 +05:00
Zheka3777123 5c86e0be10 изменил материал асвальта 2019-10-28 09:34:01 +05:00
Dron 0d7ac44dc2 и еще чуть чуть 2019-10-28 00:25:46 +05:00
Dron c0c3c30243 триллион правок 2019-10-28 00:20:34 +05:00
Dron 20203463d2 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Building1.umap
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/S2F1.umap
#	Content/Level/S2F2.umap
#	Content/Meshes/Building_3/SM_Bld4_Anex_Windows.uasset
#	Content/Meshes/Building_3/SM_S01_F01_Windows.uasset
#	Content/Meshes/Building_3/SM_S02_F01_Outside.uasset
#	Content/Meshes/Building_3/SM_S02_F01_Windows.uasset
#	Content/Meshes/Building_3/SM_S02_F02_Outside.uasset
#	Content/Meshes/Building_3/SM_S02_F03_Outside.uasset
#	Content/Meshes/Building_3/SM_S03_F01_Outside.uasset
#	Content/Meshes/Building_3/SM_S03_F01_Windows.uasset
#	Content/Meshes/Building_3/SM_S03_F02_Outside.uasset
#	Content/Meshes/Building_3/SM_S03_F03_Outside.uasset
#	Content/Meshes/Building_3/SM_S03_F03_Windows.uasset
#	Content/Meshes/interior/SM_S2_F1_Corridor_Door.uasset
#	Content/Meshes/interior/SM_S2_F1_Corridor_Door001.uasset
 2019-10-27 22:54:04 +05:00
Dron b0bdc055da дохуя всего, рабочий интерфейс 2019-10-27 22:52:15 +05:00
Zheka3777123 afe63deac5 раскрасил домики 2019-10-27 17:02:04 +05:00
Zheka3777123 b035ecc51f Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
 2019-10-27 16:36:13 +05:00
Zheka3777123 a9886b6441 получаю 2019-10-27 16:35:48 +05:00
IVAAAN 8b3d3785f4 Окружение всего вокруг, и имена улиц 2019-10-27 16:26:07 +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 b3cc5b60d2 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-27 14:00:21 +05:00
IVAAAN db6defe9b0 Заборчики у мафов, вентиляшки, дороги окружения, перекрасил площадки в садике, подписи улиц 2019-10-27 13:59:44 +05:00
Zheka3777123 2c60240a17 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Building_2.umap
#	Content/Meshes/Building2/SM_S02_Outside.uasset
#	Content/Meshes/Building2/SM_S03_Outside.uasset
 2019-10-27 11:51:28 +05:00
Zheka3777123 b9c0aa1ebe получаю 2019-10-27 11:50:47 +05:00
AndreiZaitsev 87d10ed223 Дома, дома, дома 2019-10-27 04:34:15 +05:00
Lenta_Mebiusa 55452b65a5 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-26 23:08:57 +05:00
Lenta_Mebiusa 0efe575957 Удалил бордюры и траву в интерьерах. Поправил плитку на въезде в паркинг 2019-10-26 23:08:40 +05:00
Zheka3777123 c02f665626 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-26 21:28:53 +05:00
Zheka3777123 32c4903116 добавил дверь 2019-10-26 21:28:45 +05:00
AndreiZaitsev a882c97e8a Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-26 21:25:50 +05:00
AndreiZaitsev aa4784994a Допилка 3го дома 2019-10-26 21:25:35 +05:00
Lenta_Mebiusa c80a772e90 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-26 21:05:16 +05:00
Lenta_Mebiusa 7f9fb5c520 Добавил фонарей на ближнее и дальнее окружение. Добавил деревья на дальнее окружение. Людей статичных и двигающихся на ближнее и среднее окружение. 2019-10-26 21:02:26 +05:00
IVAAAN 2d5e67ef03 Добавил окружающую территоорию 2019-10-26 16:51:21 +05:00