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

1045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dron de3c74c411 да скольк можно 
fix tags and bugs
 2026-02-12 19:01:51 +05:00
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 d631077bcc Правки 2026-01-14 17:44:44 +05:00
Victoria 5bac695948 Правки 2026-01-14 11:42:49 +05:00
Victoria bf247fa94d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2026-01-13 19:57:44 +05:00
Victoria 8d970047ff Правки 2026-01-13 19:57:38 +05:00
polina.marfuta 5c3f88608a 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
#	Content/Meshes/houses/GP12_13/GP12/S06/SM_GP12_S06_Facade.uasset
 2026-01-13 19:30:32 +05:00
polina.marfuta 8a33d927ed Дополнительные файлы для секций GP12_S06_MOP_F01 и GP12_S05_MOP_F01 2026-01-13 19:23:39 +05:00
polina.marfuta 5ed15e0562 Добавила GP12_S06_MOP_F01 и GP12_S05_MOP_F01 2026-01-13 19:21:51 +05:00
Victoria 360ff70d28 Правки 2026-01-12 19:56:37 +05:00
Victoria 78177fcaae Правки 2025-12-30 18:23:40 +05:00
Victoria 3e95ca96c2 Merge branches 'master' and 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-12-29 20:57:19 +05:00
Victoria 7ba41bbd20 Правки GP13 2025-12-29 20:56:55 +05:00
polina.marfuta b4d662d1c5 Удалила дубликат неба и доназначила материалы в GP12_S04_F01_MOP 2025-12-29 17:55:52 +05:00
polina.marfuta 6a59400aa9 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-12-29 17:26:15 +05:00
polina.marfuta 1f70b87038 Поправила ошибки в секции GP12_S04_F01_MOP 2025-12-29 17:26:04 +05:00
Victoria 0fc8163b55 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-12-29 16:54:16 +05:00
Victoria eefc5e64c7 Правки GP12 2025-12-29 16:54:12 +05:00
Dmitry a39b9672d6 fixVT 2025-12-29 15:50:40 +05:00
PC-G13 fd83b64221 mops mats 2025-12-25 18:29:48 +05:00
polina.marfuta 9b9e9db738 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/GP12_GP13.umap
 2025-12-25 16:54:13 +05:00
polina.marfuta f7db7bfec7 Добавила GP12_S04_F01 2025-12-25 16:53:11 +05:00
Dron 3ba090c961 HUUUI 2025-12-24 21:18:09 +05:00
Dron 954be20666 da ept 2025-12-24 20:58:21 +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 85fa0c058c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-12-24 12:50:56 +05:00
PC-G13 f639258785 vsyakoe 2025-12-24 12:50:48 +05:00
Victoria 46c45e06b0 Расстановка квартир GP12_S03 2025-12-20 14:31:27 +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