Commit Graph

54 Commits

Author SHA1 Message Date
GRAFF e354f1787d баба с коляской, паркинг, лифт, и всякое 2022-04-07 10:48:34 +05:00
GRAFF 0f4ebf3a47 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A03.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A08.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A09.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F03-etc.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A06.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F02.umap
#	Content/Maps/Underground_parking_GP4.umap
#	Content/Meshes/Interiors/GP4S4/Unique/SM_dom_4_F01.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground_fix.uasset
2022-04-06 20:01:28 +05:00
GRAFF eff3c9be30 дохуища всякого, планшет рабочий 2022-04-06 19:58:02 +05:00
PC-G06 73f0681bd4 S04A08 2022-04-06 17:38:32 +05:00
PC-G06 1c15e83b0e S02_Window 2022-04-06 17:00:25 +05:00
DESKTOP-8J0BKKD\Admin 8fd8870ed6 S04 Window 2022-04-06 15:51:50 +05:00
PC-G06 db945d397f S02_Window 2022-04-06 13:20:01 +05:00
PC-G04 09776cfd50 MOPs_sign_exit 2022-04-04 17:48:22 +05:00
PC-G04 2624748cc9 InfoSheet_NumberFloor 2022-04-01 21:11:25 +05:00
PC-G04 3dcfc6758d S01F01,S03F01,S04F01,S05F01_and_Halls(ass) 2022-04-01 20:10:01 +05:00
PC-G04 4feeadd394 MOP_S2,3,4 2022-03-30 21:30:30 +05:00
PC-G06 78bbbfe386 S02_Furniture 2022-03-30 15:47:11 +05:00
PC-G04 2bc99e62ad S03F01, S04F01 2022-03-29 20:28:42 +05:00
PC-G06 918d020903 S02_Mesh 2022-03-29 18:20:50 +05:00
PC-G04 87e34237d5 S04F01 2022-03-29 13:37:54 +05:00
PC-G06 18f6f58f98 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_0.uasset
2022-03-28 18:09:10 +05:00
PC-G06 7e7af7f1d9 S02_Material_Part_1 2022-03-28 18:07:00 +05:00
GRAFF d9c1a28027 дохера всего, апдейты из моей ветки 2022-03-28 16:52:04 +05:00
JohnnyHatchet 7094ded109 GP1-2 Genplsan + GP04S03 Caps + Windows interior 2022-03-26 05:16:42 +05:00
PC-G04 bf1d4ccbdf MOPs 3S 2022-03-26 03:51:22 +05:00
PC-G04 224c2523e7 Dom3F02, Dom3F01 2022-03-25 20:00:35 +05:00
PC-G06 2ac6068a32 Plintus 2022-03-25 18:55:37 +05:00
PC-G06 462836e36c S03_Interior 2022-03-25 16:37:39 +05:00
PC-G06 75fe50878d Plintis_S03 2022-03-24 16:29:39 +05:00
PC-G06 eb523108a8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-24 15:20:27 +05:00
PC-G06 a166a5041e S03A01 2022-03-24 15:20:22 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
PC-G11 68767da81e Fix Wardrobe 2022-03-24 12:20:35 +05:00
PC-G11 7adf219fa3 Cats 2022-03-24 10:57:10 +05:00
PC-G04 47a3cd55b4 S03A02, Posters_kid_and_plants 2022-03-23 22:25:43 +05:00
PC-G06 ee7f953982 S03_Mesh 2022-03-23 20:52:42 +05:00
PC-G04 3f6b845026 S03A02, S05A09 2022-03-22 21:53:18 +05:00
PC-G06 cef555c90e S03_A01_Mat 2022-03-22 20:19:05 +05:00
PC-G03 82d9cdeb52 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-22 17:37:35 +05:00
PC-G03 2053e2f063 S05A05-08 2022-03-22 17:37:23 +05:00
PC-G06 ab6eb61ff8 S03_Test 2022-03-22 16:22:08 +05:00
PC-G12 0af030fc55 Plintuth 2022-03-22 15:25:18 +05:00
PC-G06 0a57b31022 Box_Brush_Convert 2022-03-21 21:39:01 +05:00
PC-G06 8f7d0e7a8f Gp4S3 2022-03-21 20:33:00 +05:00
PC-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +05:00
PC-G04 bee7c9e425 dom_1_FL1,dom_1_Hall,dom_1_Hall_F11,dom_1_Hall_F12 2022-03-18 20:09:28 +05:00
PC-G04 0143c94881 dom_1_f4_f7 2022-03-17 19:28:26 +05:00
PC-G06 e9c02dc03b Plintus_WallPicture_Hookan 2022-03-17 16:58:07 +05:00
JohnnyHatchet 57fd964f13 Fixup redirections 2022-03-17 04:26:55 +05:00
JohnnyHatchet 1a4f1643b0 Новые фасады + фикс для процедурного меша 2022-03-17 04:26:15 +05:00
PC-G06 ff5da097be Door_Mesh_And_Mat 2022-03-16 18:37:43 +05:00
PC-G04 7a7a88f6d3 dom_1_flat_4_Interior 2022-03-16 18:22:12 +05:00
PC-G06 14ed31d2a2 BP_Light_intensity_and_Door 2022-03-15 17:20:08 +05:00
PC-G06 1c44097bd6 Lamp_Mesh 2022-03-14 16:35:59 +05:00
PC-G06 5b99f9a6d9 Eclectic_Material_Part_2 2022-03-11 17:43:14 +05:00