Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
201 Commits 9 Branches 0 Tags
b40f1d7ef840abcd21e01d36988566ff982ea2db
Commit Graph

178 Commits

Author SHA1 Message Date
GRAFF b40f1d7ef8 ХУУУУУУУУУУУУУУУУЙ 2022-03-22 09:13:08 +05:00
GRAFF 70114f1793 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Yard_GP4.umap
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof4.uasset
 2022-03-22 08:50:56 +05:00
GRAFF 8ad3f1e65a sdfnslfg 2022-03-22 08:48:05 +05:00
JohnnyHatchet 9122701af3 Двор 2022-03-22 07:28:32 +05:00
GRAFF c792c32e1d чтоб принять 2022-03-22 03:45:44 +05:00
JohnnyHatchet 9d371bc5d8 Двери в мопы 2022-03-22 02:51:48 +05:00
JohnnyHatchet 634ad689b5 Фонтан + беседка двор гп4 2022-03-22 01:21:03 +05:00
GRAFF 4bc67d6a74 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A00.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A04.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A06.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A09.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A11.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A02.umap
 2022-03-21 23:18:22 +05:00
GRAFF d0374d966f всякая штука 2022-03-21 23:15:47 +05:00
PC-G06 0a57b31022 Box_Brush_Convert 2022-03-21 21:39:01 +05:00
PC-G06 8f7d0e7a8f Gp4S3 2022-03-21 20:33:00 +05:00
PC-G03 2007d51d77 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A06.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A11.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
 2022-03-21 20:21:09 +05:00
PC-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +05:00
PC-G12 849c9018b3 S05_A01_A04_A05 2022-03-21 19:56:40 +05:00
PC-G08 08691e0f8b S05A03 плинтусы 2022-03-21 19:11:12 +05:00
PC-G08 6af8ed8483 S05A03 2022-03-21 19:00:17 +05:00
PC-G06 331d5cd9f4 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-21 14:51:33 +05:00
PC-G06 7cc155ce10 Plintus_Dom_5 2022-03-21 14:51:25 +05:00
Igor 5888379d80 Dom5_lvl2 2022-03-21 14:25:19 +05:00
PC-G12 4bb12e6870 sass0501 2022-03-21 13:08:49 +05:00
PC-G12 6ae4a499e9 Revert "no message" 
This reverts commit 20e0736e20.
 2022-03-21 13:06:59 +05:00
PC-G08 20e0736e20 no message 2022-03-21 12:38:28 +05:00
GRAFF f4550ff35d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_0.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_1.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_10.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_3.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_6.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_8.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_9.umap
#	Content/Maps/L_Lighting.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/M_Greeds_Inst.uasset
#	Content/Materials/Instances/M_Plastic_RAL_6005.uasset
#	Content/Materials/Instances/M_Plastic_RAL_7026.uasset
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Instances/t_conditioner_grid_Opacity.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_1.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_2.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_3.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/Peoples/Male_01/SM_Male_01_fbm/9_meshes_Merge_Normal.uasset
 2022-03-21 11:48:57 +05:00
JohnnyHatchet 1f30bcf5fe Почтовые ящики на первом этаже + раскинул лифты говна для заглушки по всем этажам 2022-03-21 09:37:56 +05:00
JohnnyHatchet c3bdd63a77 Перенос наполнения в лвлы с мопами с 3 по 10 этажи 2022-03-21 08:54:32 +05:00
JohnnyHatchet 1fdb2444ae Крышки - В каждый лвл с этажем (монолитные простенки + крышка для мопа) - В каждый лвл квартиры (крышка квартиры + контуринг / 1 меш 2 id) 2022-03-21 08:39:41 +05:00
JohnnyHatchet 13487a7589 Лестница + ограждение в двухуровневую квартиру 2022-03-21 04:54:43 +05:00
JohnnyHatchet f17b965d3d Work in progress blocks на входах в недоделанные секции 2022-03-21 01:40:46 +05:00
JohnnyHatchet e713bdd716 Add complex collisions + насыпал тачек на первый план 2022-03-21 00:55:34 +05:00
PC-G04 977e14b381 Irina fix 2022-03-20 23:32:44 +05:00
JohnnyHatchet 3f5e3b7d68 Интерьерные окна по всем квартирам S01 2022-03-20 22:27:58 +05:00
JohnnyHatchet d9c4c56bb0 Фулл апдейт по фасадам + ОРМка 2022-03-20 18:58:56 +05:00
PC-G12 831bce8a8b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-20 18:55:13 +05:00
PC-G12 a9ad3a835d S05A01 2022-03-20 18:55:06 +05:00
Igor f02a070b46 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-20 17:13:50 +05:00
Igor 7e9437c20b dom5_lvl2 2022-03-20 17:13:43 +05:00
JohnnyHatchet 8f0ce1940b Lightning map fix 2022-03-20 15:23:14 +05:00
JohnnyHatchet b6b024cc6b S01A01 restore 2022-03-20 15:17:55 +05:00
JohnnyHatchet 6afab6906e Материал на крышу + пристрои 2022-03-20 06:34:27 +05:00
JohnnyHatchet 86b2eac701 New facades S01 S05 2022-03-20 02:06:05 +05:00
Igor 69e5309733 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-19 20:00:21 +05:00
Igor 8b0a109ed6 Dom5_lvl2 2022-03-19 20:00:11 +05:00
PC-G03 2fe4925be0 S05A06 2022-03-19 19:06:11 +05:00
PC-G12 0509f802f7 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-19 19:03:28 +05:00
PC-G12 236da308a9 Furniture 2022-03-19 19:03:20 +05:00
PC-G03 2d18f790a0 S01A11 2022-03-19 17:16:09 +05:00
PC-G03 80ca7987dd S05A06-11 2022-03-19 13:41:27 +05:00
JohnnyHatchet 70482b8c0a Именование уровней S##A## для квартир + S##F## для этажей с мопами и пустыми квартирами + Простые крышки для простенка 2022-03-19 08:13:12 +05:00
JohnnyHatchet fbd823d457 Правки фасадов второстепенных зданий + добавил изгородь и входы во двор с лодами + высота канта двора 2022-03-19 06:30:30 +05:00
PC-G04 bee7c9e425 dom_1_FL1,dom_1_Hall,dom_1_Hall_F11,dom_1_Hall_F12 2022-03-18 20:09:28 +05:00