 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 |
|
 JohnnyHatchet
|
d769377519
|
Nightlight
|
2022-03-24 13:02:12 +05:00 |
|
|
GRAFF
|
8ad3f1e65a
|
sdfnslfg
|
2022-03-22 08:48:05 +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
|
e713bdd716
|
Add complex collisions + насыпал тачек на первый план
|
2022-03-21 00:55:34 +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 |
|
|
GRAFF
|
407047409d
|
куча барахла еще
|
2022-03-17 17:00:50 +05:00 |
|
|
JohnnyHatchet
|
004ebd3b08
|
Fix all flats + fix fasade 1 2 5
|
2022-03-15 19:37:03 +05:00 |
|
|
GRAFF
|
5d643ab427
|
без людей но со всем остальным, сдача 2 этапа
|
2022-03-01 13:55:55 +05:00 |
|
|
GRAFF
|
fc8511454f
|
всякие допилы говна, сдача 2 этапа
|
2022-03-01 13:09:50 +05:00 |
|
|
GRAFF
|
1c18765aab
|
добавление коллизий всему и вся, правки травы и еще чего то
|
2022-02-28 18:06:32 +05:00 |
|
|
JohnnyHatchet
|
997852e75b
|
yard GP_4/ yard GP_5/ Yard/ Playground Ship/ Foliage/ Cars
|
2022-02-28 04:08:36 +05:00 |
|
|
JohnnyHatchet
|
457f46c053
|
Yard_GP_4
|
2022-02-26 19:29:00 +05:00 |
|