103 Commits

Author SHA1 Message Date
GRAFF 4c30ff8ec5 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR
# Conflicts:
#	Content/Maps/Interiors/K2_S2/K2_S2_F1.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F10.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F11.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F12.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F13.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F14.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F15.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F16.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F17.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F18.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F2.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F3.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F4.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F5.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F6.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F7.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F8.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F9.umap
2022-03-21 14:59:10 +05:00
GRAFF c1baf69360 еще пачка кала 2022-03-21 14:58:37 +05:00
PC-G13 5e071b4782 K2_S2_Caps 2022-03-21 14:17:58 +05:00
GRAFF c9fd5ea6b0 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR 2022-03-20 20:22:36 +05:00
GRAFF 7b51c1ce45 ещё гора всякой шняги, расставил по этажам херни всякие, добавил планы в интерфейсы 2022-03-20 20:22:30 +05:00
PC-G12 800d08f6b1 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-20 16:49:34 +05:00
PC-G12 305baa4cc0 Caps 2022-03-20 16:49:27 +05:00
GRAFF c82ead318e Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR
# Conflicts:
#	Content/Maps/Interiors/K2_S2/K2_S2_F1.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F10.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F11.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F12.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F13.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F14.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F15.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F16.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F17.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F18.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F2.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F3.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F4.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F5.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F6.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F7.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F8.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F9.umap
#	Content/Maps/Interiors/K2_S2/Reflections/K2_S2_Reflections_General.umap
#	Content/Mavis/Meshes/Interior/K1_S4/F2/SM_K01S04F02A00.uasset
#	Content/Mavis/Meshes/Interior/K1_S4/F5/SM_K01S04F05A00.uasset
2022-03-20 15:06:16 +05:00
GRAFF a19508442a OVER9000 CHANGES, куча всего но еще надо всякое расставить, крышки еще корявые и коллизии не настроены 2022-03-20 15:04:08 +05:00
PC-G13 133365bcef CAPS k2s2 2022-03-20 12:53:18 +05:00
PC-G13 b010c96f38 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter
# Conflicts:
#	Content/Maps/Interiors/K2_S2/K2_S2_F1.umap
2022-03-20 12:10:58 +05:00
PC-G13 9c62f6ec59 Caps, k2_s1,s2 2022-03-20 12:09:54 +05:00
PC-G12 b38d97b39f Highlights 2022-03-19 15:34:10 +05:00
PC-G12 6d277da363 Caps 2022-03-19 15:17:55 +05:00
PC-G12 c11c9df65d fixs 2022-03-19 14:50:49 +05:00
PC-G13 0b4ece967c Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter
# Conflicts:
#	Content/Mavis/Meshes/Interior/K1_S4/F1/SM_K01S04F01A00.uasset
#	Content/Mavis/Meshes/Interior/K1_S4/F1/SM_K01S04F01_CapWall.uasset
2022-03-18 15:24:31 +05:00
PC-G13 20d1753d59 K1_S4_Mop 2022-03-18 15:24:12 +05:00
PC-G12 22fe645bc8 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-18 15:09:21 +05:00
PC-G12 e40f9d31a8 k1s4 2022-03-18 15:09:04 +05:00
PC-G08 779cb10e94 K02S02 2022-03-18 14:22:51 +05:00
PC-G12 cbd6e10ae6 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-17 15:30:52 +05:00
PC-G12 ce8639a595 K1S4 2022-03-17 15:28:19 +05:00
PC-G13 f59fbafb12 K2_ASS1 2022-03-17 14:30:35 +05:00
PC-G13 ce64633b8c K2_S1 2022-03-15 16:34:17 +05:00
PC-G13 9317fedd8a K2_S1 2022-03-14 19:36:42 +05:00
PC-G13 9ddac503a4 K2_S1 2022-03-11 11:32:51 +05:00
GRAFF 0ad8b36b7a v096 перепек всё, лифты поменял, пару багов нашел 2021-09-14 18:19:15 +05:00
GRAFF ca3ecea68c долбанутое количество изменений, v095 2021-09-10 21:27:24 +05:00
GRAFF 96ac007931 удалены редиректоры 2021-09-01 13:43:05 +05:00
GRAFF d129fbccff как же я заебалсяяя 2021-08-24 06:32:01 +05:00
GRAFF ab3009896e еще куча барахла 2021-08-23 17:34:23 +05:00
GRAFF 6ebbe65f33 титаническая куча всяких правок 2021-08-23 00:55:35 +05:00
PC-G09 2f21c1a654 Elevator_Door fix 2021-08-22 14:03:17 +05:00
PC-G09 93830f1bdc Кухни фикс 2021-08-21 21:41:32 +05:00
Lenta_Mebiusa 46014d0eb3 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2021-08-21 19:32:19 +05:00
Lenta_Mebiusa 1b147f81d4 Поправил кннопку лифта. Крышки затенения у 1 секции, толщины стен у 1 секции 2021-08-21 19:31:51 +05:00
PC-G13 f1375949c9 Фикс мебели + проб по всем квартирам 2021-08-21 19:15:47 +05:00
GRAFF 0d7a450a54 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter
# Conflicts:
#	Content/Maps/Foliage.umap
#	Content/Maps/MAF_Yard.umap
#	Content/Maps/Yard.umap
#	Content/Meshes/Interior/K01/S01/F01/SM_K01S01F01_Wall1.uasset
#	Content/Meshes/Interior/K01/S02/F01/SM_K01S02F01_Wall.uasset
2021-08-19 15:53:23 +05:00
GRAFF 9ffbbc0af5 куча всякого 2021-08-19 15:47:29 +05:00
PC-G09 164d490136 Моп этаж - пол + плинтус 2021-08-19 14:23:38 +05:00
PC-G09 2cecd843a1 MaterialStruct + Shower_Chrome 2021-08-18 00:11:43 +05:00
PC-G08 dcafad4b1c Плинтусы 2021-08-17 16:14:08 +05:00
PC-G09 4c56e50dab Grass MOP F1 2021-08-17 16:05:42 +05:00
GRAFF 70584d75af поправил уродские ёлки, убрал цветок в 2 й секции, расставил свет в мопах 2021-08-16 22:31:35 +05:00
PC-G09 2f33f03ad7 Landscape upd + Reflections K1_S1_F18-10 2021-08-16 19:11:07 +05:00
GRAFF 38cd9d2505 еще тьма изменений 2021-08-16 01:47:27 +05:00
PC-G09 2858daa2d5 FIX ALL NAVERNOE 2021-08-16 01:37:57 +05:00
PC-G08 826dad4e58 K1_S2 fix 2021-08-16 01:32:07 +05:00
GRAFF 0d0b8673f8 гора всяких изменений: лайтмапы для стен, подготовка этажей к печке, расстановка света, настройка коллизий стен, управление крышками стен 2021-08-15 12:21:53 +05:00
PC-G09 c3ba85f0fe Add Flat Numbers, fix roof yard, add grass mop 2021-08-13 23:44:31 +05:00