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

46 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-G04 3f6b845026 S03A02, S05A09 2022-03-22 21:53:18 +05:00
PC-G12 21de9fedf0 Curtain 2022-03-22 17:45:03 +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-G12 0fa068f858 Level_0-4 2022-03-22 17:32:50 +05:00
PC-G04 1d7b16c7e5 S05A09, S05F01 2022-03-22 17:05:53 +05:00
PC-G03 02e81c541f Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP4S5/Unique/S05A07.umap
 2022-03-22 15:57:40 +05:00
PC-G03 e267679c9a no message 2022-03-22 15:26:13 +05:00
PC-G12 0af030fc55 Plintuth 2022-03-22 15:25:18 +05:00
PC-G08 f03129a4e0 s05a01 2022-03-22 14:10:21 +05:00
PC-G03 43d45438ef S01A08, S05A08 2022-03-22 13:09:41 +05:00
PC-G12 bd11520b35 Kitchen 2022-03-22 13:05:21 +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 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
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
PC-G04 977e14b381 Irina fix 2022-03-20 23:32:44 +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 7e9437c20b dom5_lvl2 2022-03-20 17:13:43 +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
PC-G03 727fe2e095 Dom_1_f6_f8_Dom_5_f7_f8_f9 2022-03-18 20:06:43 +05:00
PC-G12 6e34c79035 dom_5_0-4 2022-03-18 20:03:21 +05:00
PC-G12 b1ffb84a18 Dom_5_Full 2022-03-18 17:51:12 +05:00
GRAFF 407047409d куча барахла еще 2022-03-17 17:00:50 +05:00
GRAFF 15f0b60364 куча хлама 2022-03-14 17:18:24 +05:00
GRAFF 8315f32314 куча изменений в интерфейсе, ИИ для люда, обновление лицензии 2022-02-17 13:51:23 +05:00
GRAFF e876ddece9 куча всякого, встроил управление по хттп, новый интерфейс, новая защита 2022-01-20 13:39:25 +05:00
PC-G09 2d0976c8bd Add floors 2022-01-10 15:58:44 +05:00