Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,044 Commits 9 Branches 0 Tags
3de665ef331c55e96924e0d4f144e573a3d9248c
Commit Graph

77 Commits

Author SHA1 Message Date
Dron 3de665ef33 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A00_F02-03.umap
 2026-02-06 17:56:03 +05:00
Dron fac4b63c27 hueta 2026-02-06 17:55:00 +05:00
polina.marfuta 46d394c52b Закончила секции МОПЫ GP12-S01,S02 и GP13-S01,S05 2026-02-04 11:55:27 +05:00
polina.marfuta 730570ba33 Исправила ошибки в МОПАХ GP12-S03, GP13-S02, S03 2026-01-23 18:06:02 +05:00
polina.marfuta d0386adc8d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Meshes/houses/GP12_13/GP13/S02/SM_GP13_S02_Facade.uasset
 2026-01-23 17:45:32 +05:00
polina.marfuta e0da68c96c Загрузила и собрала МОПЫ GP12-S03, GP13-S02, S03 2026-01-23 17:38:13 +05:00
PC-G13 3fd8a8b232 fixes 2026-01-22 17:39:08 +05:00
polina.marfuta dbe395b506 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2026-01-16 18:35:12 +05:00
polina.marfuta 8bc18e1edc Правки GP12-S04, S05,S06 и GP13-S04 2026-01-16 18:35:05 +05:00
PC-G13 f3acbc6045 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP13/S03/Interior/GP13_S03_A06_F10.umap
 2026-01-16 15:05:26 +05:00
PC-G13 74c8d54de6 fixes int 2026-01-16 15:04:52 +05:00
Victoria 94926a9a0f Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2026-01-15 13:07:31 +05:00
Victoria 34eb61f284 Правки 2026-01-15 13:07:26 +05:00
polina.marfuta 2f06d8be7b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Cubemap.uasset
#	Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Facade.uasset
 2026-01-15 12:41:01 +05:00
polina.marfuta 94996786c8 Загрузила и собрала секции G12-S05/S06 и GP13-S0 
Окончательно загрузила и собрала мопы первого этажа в секциях G12-S05-MOP-F01, G12-S06-MOP-F01 и G13-S04-MOP-F01
 2026-01-15 12:04:27 +05:00
Victoria 8d970047ff Правки 2026-01-13 19:57:38 +05:00
Victoria 78177fcaae Правки 2025-12-30 18:23:40 +05:00
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