Commit Graph

20 Commits

Author SHA1 Message Date
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
Graffin_3D a8030423df Добавление мопов на этажах 2019-12-02 21:11:55 +05:00
Zheka3777123 423df6b55a Пара правок 2019-12-02 19:48:19 +05:00
IVAAAN f9635fa1c6 Повторный коммит ассетов 2019-12-02 19:47:13 +05:00
Dron 9cdd609f46 забыл протагить 2019-12-02 18:35:11 +05:00
Dron 08303a3f4d затриггерил, нумерация капов 2019-12-02 18:31:34 +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
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
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 b4f19e2209 Получаю 2019-11-28 11:05:41 +05:00
Dron 36894ff82c ище добавки в уровни 2019-11-27 17:46:30 +05:00
Zheka3777123 495c6e6e9d мебель 2019-11-27 16:23:28 +05:00
Dron a177c6b79c штуки в левелах расставил и капы настроил 2019-11-26 21:11:57 +05:00
Zheka3777123 a9c7616313 получаю 2019-11-26 12:33:07 +05:00
Dron 3e0b035b59 тут чтото делали 2019-11-25 16:21:30 +05:00