Merge branch 'Environment-Appartment' into TempBuildSetup
# Conflicts: # EndlessVendetta/Content/Levels/Apartment_hit.umap # EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
This commit is contained in:
commit
3657ff2716
BIN
EndlessVendetta/Content/Assets/LUT/LUT_2StripTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_2StripTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_3StripTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_3StripTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_AOHighlightTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_AOHighlightTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_BaseRGBTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_BaseRGBTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_BurgasTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_BurgasTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_CandlelightTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_CandlelightTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_ChromaTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_ChromaTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_CrispWarmTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_CrispWarmTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_CrispWinterTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_CrispWinterTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_DesertTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_DesertTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_DrasticBWTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_DrasticBWTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_DropBluesTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_DropBluesTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_FallColorsTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_FallColorsTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_FilmStockTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_FilmStockTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_FoggyNightTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_FoggyNightTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_HaskovoTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_HaskovoTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_HorrorBlueTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_HorrorBlueTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_KidnPlayTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_KidnPlayTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_LateSunsetTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_LateSunsetTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_LightBluePurpleTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_LightBluePurpleTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_MoonlightTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_MoonlightTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_NightFromDayTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_NightFromDayTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_PernikTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_PernikTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_PurplePastelWhiteTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_PurplePastelWhiteTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_RedFromLumaTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_RedFromLumaTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_SofiaTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_SofiaTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_SoftWarmingTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_SoftWarmingTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_TealOrangeContrastTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_TealOrangeContrastTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_TensionGreenTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_TensionGreenTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_VarnaTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_VarnaTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_YambolTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_YambolTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/LUT_YellowPurpleTable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/LUT_YellowPurpleTable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/sepia.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/sepia.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/LUT/vibrant_test_table_01.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/LUT/vibrant_test_table_01.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_WallTest.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_WallTest.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_dust_decal_ambientocclusion.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_dust_decal_ambientocclusion.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_dust_decal_basecolor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_dust_decal_basecolor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_dust_decal_opacity.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_dust_decal_opacity.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_grunge_decal_ambientocclusion.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_grunge_decal_ambientocclusion.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_grunge_decal_basecolor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_grunge_decal_basecolor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_grunge_decal_opacity.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/EV_grunge_decal_opacity.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/decal_dust.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/decal_dust.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/decal_grunge.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/decal_grunge.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/CORP_SOCIALISM_poster_2.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/CORP_SOCIALISM_poster_2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/frame_CORP_SOCIALISM_poster_2_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/frame_CORP_SOCIALISM_poster_2_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/becca_shovel.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/becca_shovel.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/real_shovel_low.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/real_shovel_low.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/real_shovel_low_lambert1_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/real_shovel_low_lambert1_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/real_shovel_low_lambert1_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/real_shovel_low_lambert1_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/real_shovel_low_lambert1_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/shh/real_shovel_low_lambert1_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_small.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_small.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_test_01.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_test_01.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:a11f6d1396c47b3940083e8239769e23eae355713781c136f7dadf9af4bb8123
|
oid sha256:36fbf75f06c7853241528a8395d1869cbbc189986c334f7777ecb7211a3cf44e
|
||||||
size 318439
|
size 365004
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:17ed9eda8d618cf2df6ebb17a13ba47e9bbf3db53ce81be9a332fe71b78cbd23
|
oid sha256:7e024c0ced7b91dd05018d6261141732c5a20c0ad836a2037599848f770a3dfa
|
||||||
size 66790690
|
size 261
|
||||||
|
BIN
EndlessVendetta/Content/StarterContent/Particles/Materials/M_Dust_Particle.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/Particles/Materials/M_Dust_Particle.uasset
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in New Issue
Block a user