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

105 Commits

This Branch
This Branch
All Branches
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
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
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
Dron 11b72f829e Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-24 14:31:03 +05:00
Dron af90bcc973 ыыыы 2019-10-24 14:30:40 +05:00
Zheka3777123 5a89988914 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-24 13:36:26 +05:00
Zheka3777123 8284b860c8 добавил крышки 2019-10-24 13:36:23 +05:00
Dron c3c9e08b63 заменил текстурку среза земли 2019-10-24 13:22:55 +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
IVAAAN 56389e370c Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-24 12:15:50 +05:00
IVAAAN c9c8d01d75 Прорядил детство, горите в аду. А ещё добавил футбольное поле 2019-10-24 12:15:10 +05:00
Maxim deddb0f72e Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/S2F2.umap
 2019-10-24 12:05:13 +05:00
Maxim 8fcda06230 расстановка мебели 2019-10-24 12:03:39 +05:00
IVAAAN 9406952e04 Расставил МАФы рядом с садиком 2019-10-24 11:19:54 +05:00
IVAAAN ea0f915d21 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
 2019-10-24 09:54:13 +05:00
IVAAAN 72fa687deb пустой комит 2019-10-24 09:52:42 +05:00
Dron 278547db54 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-23 21:58:03 +05:00
Dron f6b00407e7 ЕЩЕЩЕЕЕЕ 2019-10-23 21:57:09 +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
Dron c21ca813ca Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-10-23 20:47:47 +05:00
Dron 7194264a76 ыыы 2019-10-23 20:47:33 +05:00
Maxim c0a01ae6e9 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Lights.umap
#	Content/Level/S2F1.umap
 2019-10-23 19:21:52 +05:00
Maxim 81bb5a60fd получаю 2019-10-23 19:21:12 +05:00
Maxim daac8f9fcf получаю 2019-10-23 19:18:41 +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