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

577 Commits

Author SHA1 Message Date
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 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 eefc5e64c7 Правки GP12 2025-12-29 16:54:12 +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 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
Ekaterina_Popova c37ef557ce GP13_fix 2025-12-17 21:43:28 +05:00
Victoria 8a7fb2ccce Расстановка квартир GP12 2025-12-16 23:21:54 +05:00
Victoria e5cfe62788 Расстановка квартир GP12 2025-12-12 20:05:59 +05:00
Ekaterina_Popova 09f3b5249d Solidify_GP13_S01 2025-12-12 11:43:26 +05:00
Victoria b42df73773 Расстановка квартир GP12 2025-12-10 20:00:55 +05:00
Victoria 71e4a0b929 Расстановка квартир GP12 2025-12-09 18:54:45 +05:00
PC-G13 346175efc4 bl 2025-11-24 14:48:03 +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
5hift c64ae4f78a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-21 13:53:17 +05:00
5hift 24fbe300ef Lil_tile_fixes 2025-11-21 13:52:58 +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 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
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 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