Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/BlendMaterial/MLB_Albedo.uasset

master

RETRY\dyatl 4 days ago

parent db7b982e91 babfdb76ba

commit d3c3e58286

48 changed files with 123 additions and 42 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

BIN

Fatal_Celebration/Content/Fatal_Celebration/Blueprint/AU_Cange_texture_Tupe_Mask_NoVT.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Blueprint/AU_texture_resize.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_ZOO_D4.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/BlendMaterial/MLB_Albedo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/M_BlockOut.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/M_Glass_Inst10.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/M_Glass_Inst9.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/MaterialBase/ML_BaseAlbedo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Display/MI_DisplayPanner7.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Display/MI_DisplayPanner8.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Fabrick/MLI_Sequins.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Fabrick/M_Kovrolin1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Paper/MLI_SandPaper1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Plastik/MLI_PlasticOld2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Plastik/MLI_Plastik15.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Plastik/MLI_Plastik3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Materials/Material_Instance/Wall_and_Floors/MLI_ConcreteTextured.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_2/lukinykhmaxim/SM_3D_FoodPrinter_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_2/lukinykhmaxim/SM_3D_FoodPrinter_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/Normal_map/SM_Curteint_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/krakensmother/SM_ElektroCvetok_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/krakensmother/SM_OxygenMask_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_4/krakensmother/T_FlowerDisplay.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/BanriL/SM_BarOfChair.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/BanriL/SM_VRHelmet.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/Normal_Map/SM_KitchenFittings_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/kernel_mrin/MI_Hub_Boot2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/kernel_mrin/SM_Vinyl_player__1_.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/kernel_mrin/T_Vinyl_player_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/kernel_mrin/T_Vinyl_player_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/kernel_mrin/T_Vinyl_player_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/kernel_mrin/album_cover_back.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/kernel_mrin/vynil_disk_album1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/ryabovaksenia/SM_Suitcase_01__3_.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/siponikk/SM_KitshenSet_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/siponikk/SM_KitshenSet_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/siponikk/SM_KitshenSet_03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/siponikk/SM_KitshenSet__004.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/siponikk/SM_Sink_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/siponikk/SM_Stove_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/siponikk/SM_Stove_02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Statue_Type2_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Statue_Type3_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/SM_Statue_Type4_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/T_Concrete_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/Textures/T_Printer.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/StarterBundle/ModularScifiProps/Materials/MI_TempControl_Screen2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/_GENERATED/ghost/Rectangle_52DC14F7.uasset (Stored with Git LFS)

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save