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
AndreiZaitsev 1bd1717b34 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Building_3.umap
#	Content/Meshes/Building_3/SM_S01_Outside.uasset
 2019-10-26 16:45:31 +05:00
AndreiZaitsev f1c739b326 Настройка текстур дома 2019-10-26 16:45:06 +05:00
Zheka3777123 c72cc60067 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-26 15:31:16 +05:00
Zheka3777123 9502f26beb добавил леснеци 2019-10-26 15:31:13 +05:00
Lenta_Mebiusa 1fae232454 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-26 13:38:45 +05:00
Lenta_Mebiusa 4003825423 Без изменений 2019-10-26 13:37:52 +05:00
Maxim 500bc0ef69 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/S3F2.umap
 2019-10-25 23:15:03 +05:00
Maxim 510046c601 ТЕКСТУРЫ 2019-10-25 23:14:37 +05:00
Dron a22615e168 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Index.umap
 2019-10-25 22:19:45 +05:00
Dron 3f88ab71d8 всякое 2019-10-25 22:19:14 +05:00
Zheka3777123 a7e3a2fcaa Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Index.umap
 2019-10-25 21:56:35 +05:00
Zheka3777123 5a5627d2da поправил дверь 2019-10-25 21:56:18 +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
Lenta_Mebiusa bc5564aaa2 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Index.umap
 2019-10-25 21:21:23 +05:00
Lenta_Mebiusa 67c8eb6d34 Добавил еще машин 2019-10-25 21:19:31 +05:00
AndreiZaitsev 4a09a47cc8 ДОм, дом, дом 2019-10-25 21:05:59 +05:00
AndreiZaitsev bdfd623786 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Building_3.umap
#	Content/Meshes/Building_3/SM_Bld4_Annex.uasset
#	Content/Meshes/Building_3/SM_S03_Roof.uasset
 2019-10-25 20:01:57 +05:00
AndreiZaitsev e2b30ae614 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Lights.umap
 2019-10-25 20:00:11 +05:00
AndreiZaitsev 81e0bbfb96 Настройка дома 2019-10-25 19:59:37 +05:00
Zheka3777123 78f326c321 добавил материал плитки 2019-10-25 19:59:10 +05:00
IVAAAN 41e1c4d211 Расставил МАФы до конца 2019-10-25 19:17:49 +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
IVAAAN 92dcd21e99 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-25 17:43:28 +05:00
IVAAAN c8f86ff901 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Blueprints/Player/MyPawn.uasset
 2019-10-25 17:42:31 +05:00
Zheka3777123 b0c954aaec Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-25 17:41:37 +05:00
Zheka3777123 257a51d969 изменил расклатку плитки 2019-10-25 17:41:33 +05:00
IVAAAN 4640dd0531 Расставил МАФы в далеке 2019-10-25 17:41:27 +05:00
Dron 1ea1891ea1 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Lights.umap
 2019-10-25 17:13:05 +05:00
Dron 0d17139fe4 немножко лодов, изменил генератор забора и тачек, солнце на юге 2019-10-25 17:11:52 +05:00
Zheka3777123 9b5b830fb1 добавмл лампы 2019-10-25 15:59:17 +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
Zheka3777123 28180f97c8 поправил лампу 2019-10-25 11:36:45 +05:00
Maxim d811422b1e текстуры 2019-10-25 11:34:21 +05:00
AndreiZaitsev b654df94d4 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Lights.umap
#	Content/Level/S2F1.umap
 2019-10-25 04:00:44 +05:00
AndreiZaitsev 1d8285baf2 Добавил 3 дом 2019-10-25 04:00:03 +05:00
Zheka3777123 aadcc910c5 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Lights.umap
#	Content/Level/S2F1_Mebel.umap
 2019-10-24 22:58:30 +05:00
Zheka3777123 1341866919 расставил мебель 2019-10-24 22:58:02 +05:00
Lenta_Mebiusa b6a9f741a1 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/MAF.umap
 2019-10-24 22:21:37 +05:00
Lenta_Mebiusa 303ebd54ee Добавил деревья, траву, людей, авто 2019-10-24 22:19:34 +05:00
IVAAAN ec345f83b1 Добавил теннис и баскетбол, игровую площадку 2019-10-24 17:46:31 +05:00
Maxim 13d46f7d48 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/S2F1.umap
#	Content/Level/S2F1_Mebel.umap
#	Content/Level/S2F2.umap
 2019-10-24 17:38:42 +05:00
Maxim 626ed9381a расстановка мебели 2019-10-24 17:37:09 +05:00