 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-G08
|
fae8b815b5
|
S03A00
|
2022-03-23 11:51:22 +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-G08
|
6649bd53f1
|
dom_1_flat_10
|
2022-03-18 18:57:39 +05:00 |
|
|
GRAFF
|
58a7df15ae
|
еще пачка всякого, добавил таги, запекатель параллаксов
|
2022-03-18 16:58:38 +05:00 |
|
 JohnnyHatchet
|
57fd964f13
|
Fixup redirections
|
2022-03-17 04:26:55 +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 |
|
 PC-G10
|
d128ec493d
|
Old Furniture migrate part 2
|
2022-03-03 13:54:43 +05:00 |
|
|
PC-G10
|
ca42b6bbda
|
Old Furniture migrate part 1
|
2022-03-03 13:53:05 +05:00 |
|