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

62 Commits

Author SHA1 Message Date
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
IVAAAN 4640dd0531 Расставил МАФы в далеке 2019-10-25 17:41:27 +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
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
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
Zheka3777123 6189a40183 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-24 17:04:05 +05:00
Zheka3777123 83c9b0e258 итерьеры 2019-10-24 17:04:02 +05:00
AndreiZaitsev 8f75e975e3 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Building1.umap
 2019-10-24 15:49:33 +05:00
AndreiZaitsev 89bd0acb13 удалил окна 2019-10-24 15:45:42 +05:00
Zheka3777123 8284b860c8 добавил крышки 2019-10-24 13:36:23 +05:00
Zheka3777123 b5247e6eed Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/S2F1.umap
#	Content/Level/S2F2.umap
#	Content/Level/S3F1.umap
#	Content/Level/S3F2.umap
 2019-10-24 12:47:23 +05:00
Zheka3777123 43f2debdac баскетбольное поле 2019-10-24 12:46:27 +05:00
Lenta_Mebiusa 127751f582 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/S2F1.umap
 2019-10-23 21:16:43 +05:00
Lenta_Mebiusa 0efca2b783 Добавлена новая трава 2019-10-23 21:15:36 +05:00
Zheka3777123 2795d1d967 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-23 19:15:09 +05:00
Zheka3777123 27ea8b920f Добавил паков 2019-10-23 19:15:05 +05:00
IVAAAN 4561a697e4 Начал расставлять МАФЫ 2019-10-23 17:43:15 +05:00
Lenta_Mebiusa 76034edabd Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
 2019-10-23 16:24:48 +05:00
Lenta_Mebiusa dc4d5c117a Добавил крышки под домами 2019-10-23 16:22:32 +05:00
Dron 15d3a1ef2f Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-23 16:08:48 +05:00
Dron f514b176e4 ещееё 2019-10-23 16:07:59 +05:00
Lenta_Mebiusa 17969ea842 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-23 14:29:42 +05:00
Lenta_Mebiusa 3ab122394d Добавил бордюры, добавил 8ую очередь, исправил развертку на дорогах и бехатоне 2019-10-23 14:29:16 +05:00
Zheka3777123 5410ae2e6f Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/S2F1.umap
 2019-10-23 13:11:26 +05:00
Zheka3777123 1e9d53980b добавил материалы плитки 2019-10-23 13:11:09 +05:00
Lenta_Mebiusa f08f6b215c Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Index.umap
 2019-10-22 20:28:22 +05:00
Lenta_Mebiusa 1c8359963a Добавлены офис, спорткомплекс, въезды в паркинг 2019-10-22 20:27:36 +05:00
Maxim 5f9995fd8d Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Lights.umap
#	Content/Level/S2F1.umap
 2019-10-22 16:17:23 +05:00
Maxim bb32dc9b46 ПОЛУЧАЮ 2019-10-22 15:43:22 +05:00
Lenta_Mebiusa 2b43651734 Правки 2019-10-22 15:03:36 +05:00
Zheka3777123 cdb662aa75 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Index.umap
#	Content/Level/S2F1.umap
 2019-10-22 14:51:25 +05:00
Zheka3777123 577ef169ac добавил паки из старых проектов 2019-10-22 14:50:29 +05:00
Lenta_Mebiusa 660f669f3f Доп правки 2019-10-22 12:25:26 +05:00
Lenta_Mebiusa 78d28d347d доп правки 2019-10-22 11:18:04 +05:00
Lenta_Mebiusa e2f2303f65 Добавил меш генплана 2019-10-21 22:50:29 +05:00
Maxim edde90a6e8 наложила материалы 2019-10-21 16:45:50 +05:00
Zheka3777123 c721244af4 добавил гардеробную 2019-10-21 10:24:01 +05:00
Zheka3777123 e261780e67 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Lights.umap
#	Content/Level/S2F1.umap
 2019-10-18 21:34:41 +05:00
Zheka3777123 397291ca3e новый унитаз 2019-10-18 21:34:03 +05:00