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

59 Commits

Author SHA1 Message Date
GRAFF df24de7f10 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A05.umap
#	Content/Maps/NightlightAim.umap
#	Content/Maps/Yard_GP4.umap
#	Content/Materials/FakeInteriors/MI_CubeRoom_1.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_2.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_3.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_6.uasset
#	Content/Materials/FakeInteriors/MI_FakeEmpty.uasset
#	Content/Meshes/Furniture/Custom/SM_CylLamp_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_Frame.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_Frame_AI.uasset
 2022-03-24 13:14:31 +05:00
PC-G11 7adf219fa3 Cats 2022-03-24 10:57:10 +05:00
Igor a7239223db dom3_lvl7 2022-03-23 19:49:23 +05:00
PC-G04 3f6b845026 S03A02, S05A09 2022-03-22 21:53:18 +05:00
PC-G03 82d9cdeb52 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-22 17:37:35 +05:00
PC-G03 2053e2f063 S05A05-08 2022-03-22 17:37:23 +05:00
PC-G04 58640b1b97 S05A009 2022-03-22 17:09:46 +05:00
PC-G04 1d7b16c7e5 S05A09, S05F01 2022-03-22 17:05:53 +05:00
PC-G08 526a09ee8e S00 2022-03-22 16:45:58 +05:00
PC-G08 5cece3b98f S03 interiors 2022-03-22 16:16:20 +05:00
PC-G12 0af030fc55 Plintuth 2022-03-22 15:25:18 +05:00
GRAFF d631be4980 НУ ВООООТ 2022-03-22 10:46:46 +05:00
GRAFF 8ad3f1e65a sdfnslfg 2022-03-22 08:48:05 +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-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +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 1fdb2444ae Крышки - В каждый лвл с этажем (монолитные простенки + крышка для мопа) - В каждый лвл квартиры (крышка квартиры + контуринг / 1 меш 2 id) 2022-03-21 08:39:41 +05:00
JohnnyHatchet 13487a7589 Лестница + ограждение в двухуровневую квартиру 2022-03-21 04:54:43 +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
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
PC-G06 1b1b8ef6f8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 20:08:43 +05:00
PC-G12 bf451f7c90 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 20:03:28 +05:00
PC-G12 6e34c79035 dom_5_0-4 2022-03-18 20:03:21 +05:00
PC-G06 ab8023a828 dom_1_flat_0_11 2022-03-18 19:59:22 +05:00
PC-G08 07b68cb6f5 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 19:00:07 +05:00
PC-G08 6649bd53f1 dom_1_flat_10 2022-03-18 18:57:39 +05:00
PC-G12 b1ffb84a18 Dom_5_Full 2022-03-18 17:51:12 +05:00
Igor a5219f0841 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 17:24:03 +05:00
Igor 0aca596870 dom_1_flat_1_2_5_9 2022-03-18 17:23:37 +05:00
PC-G03 f834c9f930 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-18 13:07:38 +05:00
PC-G03 eeec475d95 dom_1_3_6_8 2022-03-18 13:07:32 +05:00
PC-G04 0143c94881 dom_1_f4_f7 2022-03-17 19:28:26 +05:00
PC-G04 6a76960a59 Dom_1_f7 2022-03-17 17:33:41 +05:00
GRAFF a0618fa4a2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Blueprints/Lamp/BP_spotlight.uasset
#	Content/Blueprints/Lamp/BP_spotlight_1.uasset
#	Content/Blueprints/Lamp/BP_spotlight_egg.uasset
#	Content/Blueprints/Lamp/BP_spotlight_sphere.uasset
#	Content/Blueprints/Lamp/BP_spotlight_xiaomi.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_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_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/MI_Brick_01.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset
 2022-03-17 17:05:24 +05:00
PC-G06 e9c02dc03b Plintus_WallPicture_Hookan 2022-03-17 16:58:07 +05:00
JohnnyHatchet c3a798e401 fix some + add Halls 2022-03-17 05:22:24 +05:00
PC-G06 ff5da097be Door_Mesh_And_Mat 2022-03-16 18:37:43 +05:00
PC-G04 7a7a88f6d3 dom_1_flat_4_Interior 2022-03-16 18:22:12 +05:00
JohnnyHatchet 004ebd3b08 Fix all flats + fix fasade 1 2 5 2022-03-15 19:37:03 +05:00
PC-G06 8cad594926 Dom_1_Flat_All 2022-03-15 19:33:01 +05:00
PC-G04 acbd747dbe dom_1_f4 2022-03-15 19:18:55 +05:00
PC-G03 83deecc734 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
 2022-03-15 19:14:54 +05:00
PC-G03 3fe002b8af d_1_F3 2022-03-15 19:14:14 +05:00
Igor deb182ad67 dom_1_F1_F2_F5 2022-03-15 19:04:52 +05:00