Merge branch 'master' of http://wolfpredator.sknt.ru/Retry/Fatal_Celebration

2 months ago · cb690fe6b7
parent cf2ff21980 bb7505166a
commit cb690fe6b7
12 changed files with 28 additions and 16 deletions
--- a/Fatal_Celebration/Content/Collections/Materials.collection
+++ b/Fatal_Celebration/Content/Collections/Materials.collection
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_Asset_Plase.umap
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_Asset_Plase.umap
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/Scene_Light.umap
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/Scene_Light.umap
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/MLI_CementSandy.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/MLI_CementSandy.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/MLI_ConcreteCracked.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/MLI_ConcreteCracked.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/MLI_ConcreteTextured.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/MLI_ConcreteTextured.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Metal/MLI_Metal_Brushed6.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Metal/MLI_Metal_Brushed6.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/IES/Functions/Materials/MF_light_Flicker.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/IES/Functions/Materials/MF_light_Flicker.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/L_FatalCelebration_Main.umap
+++ b/Fatal_Celebration/Content/Fatal_Celebration/L_FatalCelebration_Main.umap
--- a/Fatal_Celebration/Content/Materials/Decal/D_Decal_PosterNew5.uasset
+++ b/Fatal_Celebration/Content/Materials/Decal/D_Decal_PosterNew5.uasset
--- a/Fatal_Celebration/Content/Materials/Decal/D_KitchenDecail.uasset
+++ b/Fatal_Celebration/Content/Materials/Decal/D_KitchenDecail.uasset
--- a/Fatal_Celebration/Content/Materials/Decal/Master/D_IgorDecailMasterMaterial.uasset
+++ b/Fatal_Celebration/Content/Materials/Decal/Master/D_IgorDecailMasterMaterial.uasset