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

2 days ago · 357200ed3e
parent bd2f9209db c72e892ca1
commit 357200ed3e
32 changed files with 63 additions and 63 deletions
--- 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/LI_Cam_Shots.umap
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_Cam_Shots.umap
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_Decals.umap
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_Decals.umap
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/Prefab/LI_Igorez.umap
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/Prefab/LI_Igorez.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/Decals/MI_Scrap_Paper_udrhecnka_2K.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Decals/MI_Scrap_Paper_udrhecnka_2K.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/MaterialBase/M_Glass.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/MaterialBase/M_Glass.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/MaterialBase/M_Hologram.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/MaterialBase/M_Hologram.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Fabrick/M_Fabric_Linen_Inst2.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Fabrick/M_Fabric_Linen_Inst2.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Metal/MLI_Metal.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Metal/MLI_Metal.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/Holren/Poster/SM_Poster_05.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/Holren/Poster/SM_Poster_05.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/kernel_mrin/SM_VapePipe/T_VapePipe_BaseColor.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/kernel_mrin/SM_VapePipe/T_VapePipe_BaseColor.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/lyssyx/SM_TowelBox_01.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/lyssyx/SM_TowelBox_01.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/T_Tetrapack_Atlas.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/T_Tetrapack_Atlas.uasset
--- a/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/OldRaidMigrate/Office/Microphone.uasset
+++ b/Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/OldRaidMigrate/Office/Microphone.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/Megascans/Decals/Scrap_Paper_udrhecnka/T_Scrap_Paper_udrhecnka_2K_D.uasset
+++ b/Fatal_Celebration/Content/Megascans/Decals/Scrap_Paper_udrhecnka/T_Scrap_Paper_udrhecnka_2K_D.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp1_432.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp1_432.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp2_409.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp2_409.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp3_110.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp3_110.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp4_103.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp4_103.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp5_234.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp5_234.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp6_134.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp6_134.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp7_126.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_CloseUp7_126.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_Security_Cam2_445.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_Security_Cam2_445.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot13_147.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot13_147.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot14_426.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot14_426.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot15_443.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot15_443.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot16_791.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot16_791.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot2_603.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot2_603.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot4_463.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot4_463.uasset
--- a/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot5_753.uasset
+++ b/Fatal_Celebration/Content/Sequencer/Stills/LS_WideShot5_753.uasset