Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,016 Commits 9 Branches 0 Tags
7ba41bbd20224b38f5e4eab9b5a29a0cbf607dbc
Commit Graph

60 Commits

Author SHA1 Message Date
Victoria 7ba41bbd20 Правки GP13 2025-12-29 20:56:55 +05:00
Dron c044ebbf10 AAAAAAAAA 2025-12-24 18:25:00 +05:00
Dron b66992801c da ebanye dveri 2025-12-24 17:16:54 +05:00
Dron 7eff4a5c95 doors 2025-12-24 16:53:48 +05:00
Dron 25d3d560f6 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A00_F02-03.umap
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A11_F08.umap
#	Content/Maps/Interiors/GP13/S05/Interior/GP13_S05_A00_F02.umap
#	Content/Maps/MainScene.umap
 2025-12-24 16:48:10 +05:00
Dron aab518cf20 AAAAAAAAAAAAAAA 2025-12-24 16:47:35 +05:00
PC-G13 f639258785 vsyakoe 2025-12-24 12:50:48 +05:00
PC-G13 f0aedda5ca gp12s03 gp13s02 2025-12-19 17:53:52 +05:00
Ekaterina_Popova ac78f3e5cf GP13_fix 2025-12-18 11:49:36 +05:00
Ekaterina_Popova c37ef557ce GP13_fix 2025-12-17 21:43:28 +05:00
Ekaterina_Popova 5f076771c5 GP13_fix_light 2025-12-17 19:26:49 +05:00
Ekaterina_Popova 0a2f1a128b Расстановка GP13 2025-12-17 17:57:45 +05:00
Ekaterina_Popova 95bc417531 Расстановка GP13 2025-12-16 19:53:13 +05:00
Ekaterina_Popova a0cbeedb58 Расстановка GP13 2025-12-15 19:44:46 +05:00
Ekaterina_Popova b333138df1 Расстановка GP13_S02 2025-12-12 17:50:00 +05:00
Ekaterina_Popova 7dc2e97684 Расстановка GP13_S01 2025-12-11 18:28:57 +05:00
Ekaterina_Popova a4608d80b6 Расстановка GP13_S01 2025-12-10 19:02:01 +05:00
Dron 67099ab1a9 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-22 10:39:54 +05:00
Dron 4155a137d1 aa 2025-11-22 10:39:10 +05:00
PC-G13 b36f2e7b9d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A12_F08-09.umap
 2025-11-21 18:38:06 +05:00
PC-G13 f3db9dabc6 caps, fac mats func input 2025-11-21 18:37:22 +05:00
Dron e673e75d2b uuu ska 2025-11-21 18:00:43 +05:00
PC-G13 ae13e9cd6f Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A12_F08-09.umap
#	Content/Maps/Interiors/GP13/S02/Interior/GP13_S02_A06_F07-08.umap
#	Content/Maps/Interiors/GP13/S02/Interior/GP13_S02_A07_F07-08.umap
#	Content/Maps/Interiors/GP13/S02/Interior/GP13_S02_A08_F07-08.umap
 2025-11-21 14:35:06 +05:00
PC-G13 356db120ea mdas 2025-11-21 14:33:59 +05:00
Victoria ecd5cfe38f Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP13/S05/Interior/GP13_S05_A00_F02.umap
#	Content/Maps/Interiors/GP13/S05/Interior/GP13_S05_A01_F03.umap
#	Content/Maps/Interiors/GP13/S05/Interior/GP13_S05_A02_F04.umap
 2025-11-20 23:27:47 +05:00
Victoria c55e80194d Расстановка квартир GP13_S05 2025-11-20 23:25:23 +05:00
Dron 984ddafacd pzdc 2025-11-20 21:27:55 +05:00
LittlePony 03f870b733 Fix 2025-11-20 14:03:00 +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
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 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 5ffcce2dcc Wall 2025-11-19 15:19:45 +05:00
LittlePony 8c8df10f9c Walls 2025-11-19 14:13:15 +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