Dron/GraphicaPiter
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
393 Commits 2 Branches 0 Tags
ba614585a211e415a439b0e95b262b56ea99b79d
Commit Graph

390 Commits

Author SHA1 Message Date
PC-G13 ba614585a2 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 
# Conflicts:
#	Content/Maps/Interiors/K2_S1/K2_S1_F2.umap
 2022-08-04 12:28:43 +05:00
PC-G13 a9790bf076 Стили 2_2, 2_1, новые двери 2022-08-04 12:27:54 +05:00
DESKTOP-8J0BKKD\Admin 908985a246 Правки K1_S4 2022-08-03 18:36:07 +05:00
PC-G12 16a3565bca 2.1_Styles 2022-08-03 17:18:17 +05:00
PC-G08 3aad2a6748 Правки по раскладным диванам 2022-07-25 13:50:06 +05:00
DESKTOP-8J0BKKD\Admin e8f91520bd Правки 2022-07-14 17:05:12 +05:00
GRAFF 7c213df6ca v1.26 2022-06-21 14:01:12 +05:00
GRAFF da51c55b61 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 
# Conflicts:
#	Content/Maps/Interiors/K1_S4/K1_S4_F1.umap
#	Content/Maps/Interiors/K2_S2/Furniture/K2_S2_Furniture.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F1.umap
 2022-06-16 18:25:22 +05:00
GRAFF c6ae05534e да блять а 2022-06-16 18:22:41 +05:00
DESKTOP-8J0BKKD\Admin ae86c070c4 K1S4 уебанская полка 2022-06-16 12:24:05 +05:00
DESKTOP-8J0BKKD\Admin a81d4c1bc7 1 2022-06-14 12:41:55 +05:00
DESKTOP-8J0BKKD\Admin 9d9c4c5723 K2S2 Провка по кухне 2022-06-14 12:08:05 +05:00
GRAFF 3052ce2760 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_F1.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_F10.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F11.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F12.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F13.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F14.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F15.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F16.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F17.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F18.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F2.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F3.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F4.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F5.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F6.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F7.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F8.umap
#	Content/Maps/Interiors/K2_S1/K2_S1_F9.umap
#	Content/Maps/Interiors/K2_S2/Furniture/K2_S2_Furniture.umap
#	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/TwoFloorsFlat/K2_S2_TFF_1.umap
#	Content/Maps/Interiors/K2_S2/TwoFloorsFlat/K2_S2_TFF_2.umap
 2022-06-01 19:50:50 +05:00
GRAFF 3dd25737f7 после печки 2022-06-01 19:49:42 +05:00
DESKTOP-8J0BKKD\Admin c9e7f4b69d Правки 2022-06-01 15:01:24 +05:00
DESKTOP-8J0BKKD\Admin 2da3233913 Правки 2022-05-31 16:59:56 +05:00
DESKTOP-8J0BKKD\Admin e81f889c87 Правки 2022-05-31 16:58:28 +05:00
PC-G13 5acefbb4af k2_s2 2022-05-20 19:06:03 +05:00
PC-G08 eb01b012b3 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-05-20 18:26:47 +05:00
PC-G08 70d2a3a9cc K02S02_Caps 2022-05-20 18:26:28 +05:00
PC-G13 480a758b27 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-05-20 14:08:36 +05:00
PC-G13 a21e3fa406 K1_S4 2022-05-20 14:08:32 +05:00
PC-G08 a6a79706f3 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-05-20 13:34:06 +05:00
PC-G08 c82d95acf5 K02S02_pravki2 2022-05-20 13:30:59 +05:00
PC-G13 761292558a Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-05-19 19:05:53 +05:00
PC-G13 391ce46b30 K1_S4 2022-05-19 19:05:48 +05:00
DESKTOP-8J0BKKD\Admin e93e504a93 K2S1 2022-05-19 18:49:15 +05:00
DESKTOP-8J0BKKD\Admin b6659554a3 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-05-19 17:10:00 +05:00
DESKTOP-8J0BKKD\Admin e976e2e9c9 K2S1 2022-05-19 17:09:20 +05:00
PC-G08 1959f6e07c Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-05-19 16:59:55 +05:00
PC-G08 b47310b857 K02S02_pravki 2022-05-19 16:59:14 +05:00
PC-G13 17a96bd03b K1_S4 2022-05-19 16:52:01 +05:00
PC-G13 fa8a2099dd wallpanelfix_toiletadd 2022-05-18 15:02:39 +05:00
PC-G13 b47c0dd554 K1_S4 2022-05-17 17:45:04 +05:00
GRAFF f8886ee18a уф 2022-05-05 15:36:09 +05:00
PC-G13 4c247ee843 pravon'ki 2022-04-26 18:33:30 +05:00
PC-G13 f1bc564f94 pravon'ki eshe 2022-04-26 17:43:44 +05:00
PC-G13 a3608a59eb pravon'ki 2022-04-26 13:43:55 +05:00
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