Commit Graph

26 Commits

Author SHA1 Message Date
NikitsSysun 396fd5254a dobavil stenu v sartir A05S03 2024-05-15 19:13:17 +05:00
NikitsSysun eadcd5022d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-15 19:00:54 +05:00
NikitsSysun e2bac2e4c4 pravki S03 2024-05-15 19:00:49 +05:00
PC-G13 00ed265040 mops gps fixes 2024-05-15 15:44:57 +05:00
PC-G13 d40cdff4de Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A00_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A01_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A02_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A03_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A04_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A05_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A06_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A07_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A08_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A09_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A10_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A11_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A12_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A13_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A14_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A15_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A16_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A17_F18.umap
2024-05-14 22:23:54 +05:00
PC-G13 3044d2507e int mops fixes 2024-05-14 22:20:09 +05:00
Omar dc405fd033 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 20:30:36 +05:00
PC-G13 c89e75253d mops fixes 2024-05-14 17:40:09 +05:00
PC-G13 00a47ab6b9 mops 2024-05-14 16:48:03 +05:00
Omar 3e4cd1037e Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 16:05:50 +05:00
Omar 3bf49b3da6 GP8_S03 UPD 2024-05-14 16:05:45 +05:00
PC-G13 4515f05599 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Meshes/Interiors/GP7/GP7S05/MOP/S03/SM_GP7_S03_F01_MOP_Capwall.uasset
2024-05-14 13:19:51 +05:00
PC-G13 55c3bd6011 mops s05 + commons 2024-05-14 13:19:34 +05:00
Omar a7a4215f86 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-13 19:54:57 +05:00
Omar e51fe773d8 GP8_S03 UPD 2024-05-13 19:54:53 +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
Daniil.I.Y 3bb722ddc8 GP8_S03_A09_A11_A12_A14_A16_A18_A20_A22_A22 2024-05-07 15:41:12 +05:00
Daniil.I.Y 737b7f20db Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-06 20:14:06 +05:00
Daniil.I.Y 3c9f9a8e36 GP8_S03_A01_A01_A02_A02_A04_A07_A09_A11 2024-05-06 20:14:01 +05:00
Omar 88dc843867 GP 8 S03 UPD 2024-05-06 15:41:26 +05:00
Omar 0814b69162 GP 8 2024-05-06 13:10:04 +05:00
Omar 1657bc1bcf Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-03 17:31:06 +05:00
Omar 5180939b69 GP 3 S03 A00 A03 2024-05-03 17:30:34 +05:00
Daniil.I.Y b60b745919 Windows_GP8_S03_A1_F02-10 2024-05-03 17:27:32 +05:00
SergeyVag d8cbed46d2 Gp8_S03 2024-05-02 17:12:37 +05:00