405 Commits

Author SHA1 Message Date
PC-G13 0476618f96 Правки согласно маркетинговому плану полотенцесушителей 2022-04-21 16:56:52 +05:00
GRAFF 2df40965d7 допилили v1.21 2022-04-18 19:06:56 +05:00
PC-G13 37bfcac152 2_2 caps 2022-04-13 17:05:58 +05:00
PC-G13 7e5b235449 1000 i 1 plintus 2022-04-13 13:10:26 +05:00
PC-G13 850783a545 poprav ochka 2022-04-12 17:54:11 +05:00
PC-G12 8233987aca Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-04-05 14:21:16 +05:00
PC-G12 21b35d94ce K1S4 2022-04-05 14:21:07 +05:00
PC-G08 37964fcb43 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-04-05 14:07:16 +05:00
PC-G08 f6309d0364 K02S02 WallCaps, Furniture, Plinths 2022-04-05 14:07:10 +05:00
PC-G13 738842e96a Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-04-05 13:56:49 +05:00
PC-G13 abbb782fbc K2_S1 2022-04-05 13:56:47 +05:00
GRAFF b5903fe62c еще всякие допилы 2022-04-04 15:27:21 +05:00
GRAFF 72d2cbfe23 всякие запечения и прочее 2022-04-03 02:33:01 +05:00
PC-G13 7b44f8917d smth 2022-04-01 13:41:13 +05:00
PC-G13 35ee672ecd FurFix_v0.1 2022-03-23 12:48:31 +05:00
PC-G13 bfba273c95 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter
# Conflicts:
#	Content/Maps/Interiors/K1_S4/Furniture/K1_S4_Furniture.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F10.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F11.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F12.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F13.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F14.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F15.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F16.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F17.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F18.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F2.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F3.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F4.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F5.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F6.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F7.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F8.umap
#	Content/Maps/Interiors/K1_S4/K1_S4_F9.umap
#	Content/Maps/Interiors/K2_S1/Furniture/K2_S1_Furniture.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F2.umap
#	Content/Maps/Interiors/K2_S2/Furniture/K2_S2_Furniture.umap
2022-03-22 12:21:30 +05:00
PC-G13 a1129e03b2 FurniFix 2022-03-22 12:21:02 +05:00
GRAFF 359ea1d011 костылями завершили 2й дом 2022-03-21 23:51:23 +05:00
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
GRAFF e0dbfebf58 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR 2022-03-19 15:45:57 +05:00
PC-G12 b38d97b39f Highlights 2022-03-19 15:34:10 +05:00
GRAFF 6f08e98ef7 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR 2022-03-19 15:22:19 +05:00
PC-G12 6d277da363 Caps 2022-03-19 15:17:55 +05:00
GRAFF 12bfc92fa7 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR 2022-03-19 14:57:37 +05:00
PC-G12 c11c9df65d fixs 2022-03-19 14:50:49 +05:00
GRAFF bcd21dc2b7 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR 2022-03-18 17:15:14 +05:00
PC-G12 aa127ac164 bldng_some_fix 2022-03-18 16:34:47 +05:00
PC-G12 eef1ee73da Buildings 2022-03-18 16:13:23 +05:00
PC-G12 91bbe144cc Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-18 15:37:54 +05:00
PC-G12 dc074df555 k1s4_Fur 2022-03-18 15:37:45 +05:00
PC-G13 91cb7cb401 k1_s4_f1 2022-03-18 15:34:14 +05:00
PC-G13 2b0ee4187e k1_s4_f1 2022-03-18 15:29:08 +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-G13 0eb0289a87 K2_S2_refl_again 2022-03-18 13:31:06 +05:00
PC-G13 08be2a6458 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-17 17:32:28 +05:00