Commit Graph

899 Commits

Author SHA1 Message Date
LittlePony 5ffcce2dcc Wall 2025-11-19 15:19:45 +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
LittlePony 4e56597bf2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-11-17 10:42:22 +05:00
aRomDonDon ab3bed4ca4 GP12S06 интерьерка 2025-11-17 10:09:01 +05:00
LittlePony be3cfc04f8 Light 2025-11-14 17:23:24 +05:00
LittlePony c715fb28b2 MOP 2025-11-14 16:23:54 +05:00
LittlePony 535e68ecdb Light 2025-11-14 02:00:40 +05:00
LittlePony 9f2addc6c9 Meshes 2025-11-14 00:32:55 +05:00
Dron 5aaa52e339 dis traces 2025-09-26 11:11:05 +05:00
Dron ab24e6353e v3 done 2025-09-25 15:33:25 +05:00
Dron 0cf1504f3c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/MainScene.umap
2025-09-24 20:43:49 +05:00
Dron 3b9aaccb3b dd 2025-09-24 20:43:26 +05:00
PC-G13 41ac803a30 mda 2025-09-24 19:16:09 +05:00
PC-G13 2ae2b0c1c6 cars 2025-09-24 18:46:28 +05:00
PanJablonsky 259a948cdf abnui aivaz suka 2025-09-24 18:29:11 +05:00
PanJablonsky 65bca6f761 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-09-24 16:00:59 +05:00
PanJablonsky 9e8c758227 mafs imp 2025-09-24 16:00:31 +05:00
5hift dc88b10918 GP_fixes_AND_Facade_import_reimport 2025-09-24 15:54:37 +05:00
Dron 5d75f89cbb Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/MainScene.umap
2025-09-23 19:38:05 +05:00
Dron 2a6b4c1846 upd streetlamp, light, dof, c++ xml parse 2025-09-23 19:37:20 +05:00
5hift 0f430f2606 Benches_on_walls 2025-09-23 17:51:32 +05:00
5hift 824a7b9d8a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Meshes/houses/GP12_13/GP13/S01/SM_GP13_S01_Facade.uasset
#	Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S08_09_Mask.uasset
#	Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Collision.uasset
#	Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Decal.uasset
#	Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Facade.uasset
#	Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Windows.uasset
2025-09-23 16:19:09 +05:00
5hift bf317c1f05 Facade Location fix_add_some new 2025-09-23 16:16:21 +05:00
PanJablonsky d7582326d3 smth 2025-09-23 15:32:44 +05:00
PC-G13 7c44a75599 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-09-19 16:59:02 +05:00
PC-G13 541d99f899 mda 2025-09-19 16:26:47 +05:00