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

46 Commits

Author SHA1 Message Date
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 cc80a0f43b добавил моп 2019-11-22 14:35:04 +05:00
Zheka3777123 1f1859fb58 Стены S2F1 и S3F1 2019-11-20 14:15:03 +05:00
Dron 9ef77f5f2a начал переделки 2019-11-06 14:30:05 +05:00
Dron fe38f0dfe1 ну давай же 2019-11-01 15:43:58 +05:00
Dron b7bbd2d109 тестовйы образец блеть 2019-10-29 14:04:24 +05:00
Dron a3e6a2c67a veeee 2019-10-29 03:55:08 +05:00
Zheka3777123 61f086148e даскрасил стены первый этаж 2019-10-28 18:45:52 +05:00
Zheka3777123 744c95a549 поправил телики 2019-10-28 17:27:45 +05:00
Zheka3777123 be5de27d91 раскрасил стены 2019-10-28 17:00:50 +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 32c4903116 добавил дверь 2019-10-26 21:28:45 +05:00
Zheka3777123 9502f26beb добавил леснеци 2019-10-26 15:31:13 +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
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
Zheka3777123 257a51d969 изменил расклатку плитки 2019-10-25 17:41:33 +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
Maxim d811422b1e текстуры 2019-10-25 11:34:21 +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
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 83c9b0e258 итерьеры 2019-10-24 17:04:02 +05:00
Zheka3777123 8284b860c8 добавил крышки 2019-10-24 13:36:23 +05:00
Zheka3777123 43f2debdac баскетбольное поле 2019-10-24 12:46:27 +05:00
Zheka3777123 27ea8b920f Добавил паков 2019-10-23 19:15:05 +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
Maxim bb32dc9b46 ПОЛУЧАЮ 2019-10-22 15:43:22 +05:00
Maxim edde90a6e8 наложила материалы 2019-10-21 16:45:50 +05:00
Zheka3777123 c721244af4 добавил гардеробную 2019-10-21 10:24:01 +05:00
Zheka3777123 397291ca3e новый унитаз 2019-10-18 21:34:03 +05:00
Zheka3777123 b65ba6a39c паки 2019-10-16 11:59:05 +05:00
Zheka3777123 f993a24ef1 поправил дверь 2019-10-15 10:44:41 +05:00
Zheka3777123 ad97ee724b доббавил мопы 2019-10-14 22:41:25 +05:00
Zheka3777123 aa4a1e255a добавил материалы паралакса 2019-10-14 17:35:16 +05:00
Zheka3777123 857f4e3a21 моп 2019-10-14 10:31:58 +05:00
Zheka3777123 a34fcfe06e Добавил стены 2019-10-10 11:30:49 +05:00