Commit Graph

433 Commits

Author SHA1 Message Date
PC-G13 858df04b2f yard 2024-05-15 16:02:05 +05:00
PC-G13 00ed265040 mops gps fixes 2024-05-15 15:44:57 +05:00
NikitsSysun 3390b8540d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-15 12:28:25 +05:00
NikitsSysun 75204584b9 еще генплана на лопате 2024-05-15 12:28:20 +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
NikitsSysun 8c3ed5f9d3 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 19:13:55 +05:00
NikitsSysun 0a4f998889 правОЧКА гейплана 2024-05-14 19:06:20 +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
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
NikitsSysun 552ef5d493 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-13 17:44:35 +05:00
NikitsSysun 09d53d658b Правки S04 плинтус 2024-05-13 17:44:31 +05:00
SergeyVag 1ecfaad102 чинил крышки 2024-05-13 15:44:41 +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 006ae41cb8 колизии на фасадах 2024-05-13 12:55:53 +05:00
SergeyVag efa5fed049 Еще правка фасада 2024-05-13 12:47:38 +05:00
SergeyVag 0a4f1c55c6 фасады 2024-05-13 12:30:10 +05:00
SergeyVag 68e9846805 всякое 2024-05-13 11:24:56 +05:00
JohnnyHatchet cfef2adfb9 Folliage Outside + More osm 2024-05-13 04:45:00 +05:00
PC-G04 977c11cb3c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-10 14:39:27 +05:00
PC-G04 7b72749260 !!!! 2024-05-10 14:39:02 +05:00
Daniil.I.Y 8a43e3c56e Plinth 2024-05-10 14:29:31 +05:00
JohnnyHatchet 1b09d4f046 fix zfight + del folli 2024-05-09 18:41:24 +05:00
PC-G04 30d21dddc3 gp8s05 квартиры 2024-05-09 16:52:48 +05:00
PC-G04 a61e5a78da Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-08 20:12:24 +05:00
PC-G04 9c165fac67 gp8 s05 квартиры 2024-05-08 20:11:48 +05:00
Omar 6e533d93c5 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-08 20:11:29 +05:00
Omar b9ec0302da GP8_S04 2024-05-08 20:11:25 +05:00
Daniil.I.Y dbd4eb6618 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-08 20:05:55 +05:00
Daniil.I.Y c6eef2ffbd A12_A11_A08_A07 2024-05-08 20:05:51 +05:00
SergeyVag b46c3d548b Крышгки на первые этажи Gp7 2024-05-08 19:39:00 +05:00
SergeyVag 5ee82188b6 ффикс фасадов 2024-05-08 19:02:15 +05:00
SergeyVag 2150ef3278 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-08 17:59:51 +05:00
SergeyVag 66ccd79f88 Крышки S04 отдернул окна от фасадов 2024-05-08 17:59:48 +05:00
PC-G04 96cc457a35 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-08 13:18:12 +05:00
PC-G04 3ccfcf94a1 gp8s05 windows 2024-05-08 13:16:47 +05:00
Omar 48dc633a73 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-08 13:11:02 +05:00
Omar 2abaa6cefa GP8_S04 2024-05-08 13:10:58 +05:00
Daniil.I.Y f11c08334a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-07 21:01:55 +05:00
Daniil.I.Y bbf06b2642 A02_A07 2024-05-07 21:01:49 +05:00
SergeyVag 0f85ecf10e Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-07 19:18:09 +05:00
SergeyVag 826c970641 S05 крышки и всякое г 2024-05-07 19:18:07 +05:00
NikitsSysun cc584bd8ac Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-07 19:07:11 +05:00
NikitsSysun d308c40e03 GP8_S04_A03-A04 2024-05-07 19:07:01 +05:00
Omar 1d31938505 Windows UPD 2024-05-07 18:52:53 +05:00
Omar 5b2c5f0126 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-07 18:34:17 +05:00
Omar 04db04ad3b Windows GP8_S04 2024-05-07 18:34:12 +05:00