Commit Graph

46 Commits

Author SHA1 Message Date
PC-G12 512acbb066 DRMs 2024-06-24 19:59:06 +05:00
PC-G13 3044d2507e int mops fixes 2024-05-14 22:20:09 +05:00
PC-G13 c89e75253d mops fixes 2024-05-14 17:40:09 +05:00
PC-G13 d65d88ddc3 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP7/S02/GP7_S02_F01_MOP.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03_F01_MOP.umap
#	Content/Maps/Interiors/GP7/S04/GP7_S04_F01_MOP.umap
#	Content/Maps/Main_Building.umap
#	Content/Meshes/Interiors/GP8/S04/Cap/SM_GP8_S04_A03_F02_Cap.uasset
#	Content/Meshes/Interiors/GP8/S04/CapWall/SM_GP8_S04_F02_07_CapWall.uasset
#	Content/Meshes/houses/GP8/S02/SM_GP8_S02.uasset
#	Content/Meshes/houses/GP8/SM_GP8_S01_Windows.uasset
#	Content/Meshes/houses/GP8/SM_GP8_S03.uasset
2024-05-13 14:23:40 +05:00
PC-G13 0a28c5d04c mops 2024-05-13 14:20:16 +05:00
SergeyVag 68e9846805 всякое 2024-05-13 11:24:56 +05:00
PC-G13 810b57858b gp, mats, osm mat migrate, 2023-12-07 18:29:29 +05:00
PC-G13 fa7dc5940f ny i 4to tam so stalkerom to? 2023-12-03 19:16:56 +05:00
PC-G12 180aad1850 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2023-12-02 14:32:57 +05:00
PC-G12 eeba501f0e GP 2023-12-02 14:26:44 +05:00
Dron 035067c2a5 fasadhide/points/core override/ 2023-12-01 23:52:23 +05:00
PC-G12 e5b9fd03e9 qr 2023-11-22 19:47:52 +05:00
PRAyMU 5f71a3f73a M_Test_Room_P2 2023-11-15 01:04:34 +05:00
GRAFF 8dee98005b лодочки и прочая фигня 2022-04-18 17:29:38 +05:00
GRAFF 8db9667560 еще немного 2022-04-11 11:44:00 +05:00
GRAFF 0b5b390cc7 просто гора всякого еще 2022-04-10 01:04:22 +05:00
GRAFF 79caaf2b19 ооой мляяяя 2022-04-08 11:21:22 +05:00
GRAFF 94187c56e2 MOOOOREEE 2022-04-07 19:30:54 +05:00
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
JohnnyHatchet 7288ff3275 Parking + Elevators 2022-04-05 06:05:11 +05:00
PC-G06 1afb869cf8 S02_Door 2022-03-29 15:14:03 +05:00
PC-G04 87e34237d5 S04F01 2022-03-29 13:37:54 +05:00
GRAFF d9c1a28027 дохера всего, апдейты из моей ветки 2022-03-28 16:52:04 +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 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-G08 fae8b815b5 S03A00 2022-03-23 11:51:22 +05:00
PC-G06 ab6eb61ff8 S03_Test 2022-03-22 16:22:08 +05:00
PC-G06 ab8023a828 dom_1_flat_0_11 2022-03-18 19:59:22 +05:00
PC-G08 6649bd53f1 dom_1_flat_10 2022-03-18 18:57:39 +05:00
JohnnyHatchet 57fd964f13 Fixup redirections 2022-03-17 04:26:55 +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 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
PC-G06 787fdd0689 Eclectic_Material_Part_1 2022-03-10 17:18:07 +05:00
PC-G10 f5a2342741 Old Furniture migrate part 6 2022-03-03 14:21:18 +05:00
PC-G10 7b4e938ba7 Old Furniture migrate part 5 2022-03-03 14:19:29 +05:00
PC-G10 2ceeed533d Old Furniture migrate part 4 2022-03-03 14:16:15 +05:00
PC-G10 dc80bbf82d Old Furniture migrate part 3 2022-03-03 14:13:12 +05:00
PC-G10 d128ec493d Old Furniture migrate part 2 2022-03-03 13:54:43 +05:00
PC-G10 ca42b6bbda Old Furniture migrate part 1 2022-03-03 13:53:05 +05:00