Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_Asset_Plase.umap
#	Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_Cam_Shots.umap
#	Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/Prefab/LI_Igorez.umap
#	Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/Scene_Light.umap
#	Fatal_Celebration/Content/Fatal_Celebration/Environment/Meshes/Day_5/spoon_l/Trash/T_Kit_BaseColor.uasset
#	Fatal_Celebration/Content/Fatal_Celebration/L_FatalCelebration_Main.umap

master

RETRY\dyatl 2 days ago

parent 138291d3c0 c7c4969e15

commit 06c743b80b

11 changed files with 14 additions and 23 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/Cinematics/FatalRenderPreset.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/LevelInstances/LI_Actor.umap (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/Meshes/Day_2/BanriL/SM_Bioshock_v01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Fatal_Celebration/Environment/VFX/MI_Cenzored_Inst1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Fatal_Celebration/Content/Graffiti_Street_Art/Decals/M_T_0003_Inst4.uasset (Stored with Git LFS)

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save