Commit Graph

1056 Commits

Author SHA1 Message Date
Dron 8266343ecd aa 2025-11-20 15:42:09 +05:00
LittlePony 03f870b733 Fix 2025-11-20 14:03:00 +05:00
LittlePony 9ab429f38b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-20 13:58:39 +05:00
5hift 2125512337 CapWallLevelsGP2345_And_GP_fixes 2025-11-20 13:57:06 +05:00
LittlePony fd38760057 Fix 2025-11-20 13:57:02 +05:00
Dron e454a774d6 boje 2025-11-19 21:04:49 +05:00
Dron 930abca5fc Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP12/S05/Interior/GP12_S05_A08_F02-23.umap
#	Content/Maps/Interiors/GP12/S06/Flats/GP12_S06_A00_F02-04_06-09_11-14_16-17.umap
2025-11-19 19:57:43 +05:00
Dron 1393c71e3e points.. 2025-11-19 19:57:24 +05:00
PC-G13 5a0bd10276 gp13s01 cw 2025-11-19 19:29:26 +05:00
Victoria 0a60dbba11 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Meshes/Interiors/GP12/S03/MOP/SM_GP12_S03_F14_F2-12_Mop_F02-09_11_Floor.uasset
#	Content/Meshes/Interiors/GP12/S03/MOP/SM_GP12_S03_F14_F2-12_Mop_F02-09_11_Plinth.uasset
#	Content/Meshes/Interiors/GP12/S03/MOP/SM_GP12_S03_F14_F2-12_Mop_F02-09_11_Walls.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F02-06_08-13_Mop_Floor.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F02-06_08-13_Mop_Plinth.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F02-06_08-13_Mop_Walls.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F07_Mop_Floor.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F07_Mop_Plinth.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F07_Mop_Walls.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F14_Mop_Floor.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F14_Mop_Plinth.uasset
#	Content/Meshes/Interiors/GP12/S04/MOP/SM_GP12_S04_F14_Mop_Walls.uasset
2025-11-19 19:01:55 +05:00
Victoria a0c944bf94 Расстановка квартир 2025-11-19 18:59:25 +05:00
5hift caae94ca56 S03_S04_interiors AND collision + some fixes 2025-11-19 18:47:24 +05:00
aRomDonDon a5cd11d6e8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-19 18:33:48 +05:00
aRomDonDon d8eea22f6f Интерьерка GP12S06 и GP13S01 2025-11-19 18:33:44 +05:00
LittlePony 753371662b Facade 2025-11-19 17:29:30 +05:00
LittlePony fb51996eec Windows 2025-11-19 17:15:16 +05:00
LittlePony f3a08292a6 Del 2025-11-19 16:27:07 +05:00
LittlePony 0beadc9c46 CapWall 2025-11-19 15:42:12 +05:00
Victoria 7fe182fb5b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP12/S02/Interior/GP12_S02_A02_F02-09.umap
2025-11-19 15:22:38 +05:00
Victoria 17979a4512 Расстановка квартир 2025-11-19 15:20:32 +05:00
LittlePony 24e0b6cc0e Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-19 15:19:50 +05:00
LittlePony 5ffcce2dcc Wall 2025-11-19 15:19:45 +05:00
5hift 768a5f4d7b S03_S04_S05 2025-11-19 15:17:23 +05:00
aRomDonDon 7a50ab55ab Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-19 14:40:16 +05:00
aRomDonDon 7f09f2d867 Интерьерка GP12S06 финал (ли) 2025-11-19 14:40:12 +05:00
LittlePony 6886f85d1b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-19 14:13:25 +05:00
LittlePony 8c8df10f9c Walls 2025-11-19 14:13:15 +05:00
PC-G13 2af9e90496 gp13s01 meshes 2025-11-19 14:03:52 +05:00
LittlePony dfaeee0e14 FlatCap 2025-11-19 12:27:59 +05:00
Dron 9d434faec6 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-18 21:03:17 +05:00
Dron c14ccf2d57 points 2025-11-18 21:03:08 +05:00
LittlePony 2db0f1b281 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-18 20:03:13 +05:00
LittlePony 6ecdd9babb Fix 2025-11-18 20:03:08 +05:00
Victoria de68d65f69 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/GP12_GP13.umap
2025-11-18 19:29:49 +05:00
aRomDonDon 14d01f6993 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-18 19:26:49 +05:00
Victoria 40dd72ddad Расстановка квартир GP13_S05 и GP12_S02 2025-11-18 19:26:45 +05:00
aRomDonDon 4f965ac17c Интерьерка GP12S06 возмездие 2025-11-18 19:26:42 +05:00
LittlePony 0d3f6da75c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-18 18:53:19 +05:00
LittlePony e806664f51 Light 2025-11-18 18:53:12 +05:00
Dron 2319bd4e2c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-18 18:36:39 +05:00
Dron 0b448529e8 flatdata done 2025-11-18 18:36:36 +05:00
LittlePony 88eb4d69d4 Light 2025-11-18 15:24:14 +05:00
aRomDonDon 9fe7e6ccae Интерьерка GP12 S06 продолжение 2025-11-17 20:10:41 +05:00
Victoria eb35ec43fd Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-17 18:29:07 +05:00
Victoria b329b1c5a3 Расстановка квартир GP13_S05 2025-11-17 18:28:58 +05:00
5hift c315ea35a6 GP12_S02_S03_S04_S05_import 2025-11-17 14:24:48 +05:00
LittlePony 9384ae6e73 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-17 14:16:04 +05:00
LittlePony f111c072ef Light 2025-11-17 14:16:00 +05:00
Victoria 55cc9137ee Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-17 12:24:12 +05:00
Victoria 63ce4afc5c Apartment 2025-11-17 12:24:09 +05:00