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

417 Commits

Author SHA1 Message Date
Zheka3777123 527c219078 Раскрасил квартиры 2019-12-03 20:16:23 +05:00
Zheka3777123 2c6b08a3f2 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/New_S3F2/S3F2.umap
 2019-12-03 19:01:14 +05:00
Zheka3777123 0e5b23ac42 Получаю 2019-12-03 19:00:59 +05:00
GRAFF 1c7549a639 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/ura 2019-12-03 18:57:51 +05:00
GRAFF 8f4d282abe +Квартира 2019-12-03 18:57:46 +05:00
DMITRY2000 90f643c296 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-12-03 18:21:37 +05:00
DMITRY2000 e0217e84e8 Поправил окна и хуй смним 2019-12-03 18:21:29 +05:00
GRAFF 764dd1b09c Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/New_S2F1/S2F1.umap
#	Content/Level/New_S2F2/S2F2.umap
#	Content/Level/New_S3F2/S3F2.umap
 2019-12-03 17:34:00 +05:00
GRAFF 42748ff95c Мопы 3 секции 2019-12-03 17:11:28 +05:00
IVAAAN de0c9953ab Пильдозеро 2019-12-03 17:11:01 +05:00
DMITRY2000 a86b1c262e Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
 2019-12-03 17:06:07 +05:00
DMITRY2000 32ed06a16b блять 2019-12-03 17:05:13 +05:00
DMITRY2000 d2c8f901b3 Всунул все дома окружения 2019-12-03 17:00:37 +05:00
Zheka3777123 9a457ed712 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-12-03 16:03:16 +05:00
Zheka3777123 beeeffa2ea Квартиры 2019-12-03 16:03:12 +05:00
Lenta_Mebiusa c88f52dc2f Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/People.umap
#	Content/PeopleSplineWalk/PeopleMove.uasset
 2019-12-03 15:38:59 +05:00
Lenta_Mebiusa 2ed7548725 Дорасставил всех людей 2019-12-03 15:36:46 +05:00
Zheka3777123 75a58d68be Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/New_S3F1/S3F1.umap
 2019-12-03 14:29:59 +05:00
Zheka3777123 ace57c7dec хаты 2019-12-03 14:29:41 +05:00
Zheka3777123 fdc93b483d Новые хаты 2019-12-03 14:29:28 +05:00
Dron 9afd5c60fe playerStarts расположения 2019-12-03 14:15:30 +05:00
Dron 2cff60fa53 фывфыв 2019-12-03 13:44:53 +05:00
GRAFF a58b3006a7 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/New_S3F1/S3F1.umap
#	Content/Level/S3F2.umap
 2019-12-03 13:38:12 +05:00
GRAFF 1c786f1272 Мопы 2019-12-03 13:36:29 +05:00
Zheka3777123 c5dcaed784 Правки по квартирам 2019-12-03 12:00:40 +05:00
Graffin_3D 5c2bc8666c 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
#	Content/Level/S2F2.umap
#	Content/Level/S3F2.umap
 2019-12-03 11:31:16 +05:00
Zheka3777123 50461f5d91 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-12-03 09:59:35 +05:00
Dron f487928c5f перенос левела, почему сразу так было не сделать? в заблуждение только вводите этим 2019-12-02 21:29:12 +05:00
Graffin_3D a8030423df Добавление мопов на этажах 2019-12-02 21:11:55 +05:00
DMITRY2000 0db4edba13 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
ебанарот возврат радиаторов и прочей фигни
 2019-12-02 21:02:54 +05:00
DMITRY2000 0ca13de005 ну Дима ептыть 2019-12-02 20:48:50 +05:00
AndreiZaitsev 83d3555589 правки домов 1,4 2019-12-02 20:32:47 +05:00
Zheka3777123 423df6b55a Пара правок 2019-12-02 19:48:19 +05:00
Zheka3777123 f94adf6363 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/AssetPacks/Kitchen/Fridge/MI_Corpus.uasset
#	Content/AssetPacks/Kitchen/SM_Smeg_Fridge_SM_Smeg_Fridge_01.uasset
#	Content/AssetPacks/Kitchen/SM_Smeg_Fridge_SM_Smeg_Fridge_02.uasset
#	Content/Level/New_S2F1/S2F1.umap
#	Content/Level/New_S2F1/S2F1F1.umap
#	Content/Level/New_S2F1/S2F1F2.umap
#	Content/Level/New_S2F1/S2F1F3.umap
#	Content/Level/New_S2F1/S2F1F4.umap
#	Content/Level/New_S2F1/S2F1F5.umap
#	Content/Level/New_S2F1/S2F1F6.umap
#	Content/Level/New_S2F1/S2F1F7.umap
#	Content/Level/New_S2F1/S2F1F8.umap
#	Content/Level/New_S2F2/S2F2.umap
#	Content/Level/New_S2F2/S2F2F1.umap
 2019-12-02 18:38:04 +05:00
Zheka3777123 7dcff6bdf3 Мебель S2F2 2019-12-02 18:36:50 +05:00
Dron 9cdd609f46 забыл протагить 2019-12-02 18:35:11 +05:00
Dron 08303a3f4d затриггерил, нумерация капов 2019-12-02 18:31:34 +05:00
Dron bb9b395d8c Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-12-02 17:36:57 +05:00
Dron 9a618b3564 добавил триггеры 2019-12-02 17:36:51 +05:00
GRAFF 79796d61b1 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/ura 
# Conflicts:
#	Content/Level/Lights.umap
#	Content/Level/New_S3F1/S3F1F1.umap
#	Content/Level/New_S3F1/S3F1F2.umap
#	Content/Level/New_S3F1/S3F1F4.umap
 2019-12-02 16:33:13 +05:00
GRAFF 3b79a6203c +квартира 2019-12-02 16:30:21 +05:00
Dron 90dd1f34e7 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-12-02 15:08:31 +05:00
Dron 65d3b4c51e поправил ген травы 2019-12-02 15:08:27 +05:00
GRAFF 07558bf8e4 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/ura 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Level/New_S3F1/S3F1.umap
#	Content/Level/New_S3F1/S3F1F6.umap
#	Content/Level/New_S3F1/S3F1F7.umap
 2019-12-02 14:30:19 +05:00
GRAFF 1322ba3ba4 расстановка 2019-12-02 14:27:52 +05:00
Lenta_Mebiusa 3af1688073 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 
# Conflicts:
#	Content/Level/Index.umap
 2019-11-29 22:08:15 +05:00
Lenta_Mebiusa e2ada8513f Добавил еще людей. Настроил материалы. Поменял блупринт ходьбы людей 2019-11-29 22:07:45 +05:00
DMITRY2000 690118ada0 Ещё дом 2019-11-29 18:31:26 +05:00
Dron f86ff8d6da Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA 2019-11-29 16:59:10 +05:00
Dron 8dd8bd6fa6 okty 2019-11-29 16:48:21 +05:00