Merge branch 'Outside-Lighting-Pass' into dev
# Conflicts: # EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
This commit is contained in:
commit
6a656e1d6a
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/StripLight/Light_emissive.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/StripLight/Light_emissive.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/StripLight/Light_emissive_colour.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/StripLight/Light_emissive_colour.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Doors/M_Door.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/fame_glass.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/fame_glass.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/fishtank_glass.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/fishtank_glass.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/concrete_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/concrete_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/concrete_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/concrete_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/concrete_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/concrete_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/concrete_tileable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/concrete_tileable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/metal_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/metal_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/metal_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/metal_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/metal_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/metal_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/metal_tileable.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Buildings/tileable_building_textures/metal_tileable.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/arcade_cabinet.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/arcade_cabinet.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/basket.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/basket.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/basket_mat.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/basket_mat.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench_lambert2_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench_lambert2_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench_lambert2_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench_lambert2_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench_lambert2_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench_lambert2_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench_mat.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/bench_mat.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_arcade_carpet_ambientocclusion.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_arcade_carpet_ambientocclusion.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_arcade_carpet_basecolor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_arcade_carpet_basecolor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_arcade_carpet_normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_arcade_carpet_normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_ambientocclusion.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_ambientocclusion.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_basecolor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_basecolor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_height.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_height.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_roughness.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/EV_floor_tiles_roughness.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/arcade_carpet.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/arcade_carpet.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/floor_tile.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Parlour/tileable_textures/floor_tile.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/BusStop.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/BusStop.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/FireHydrant01.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/FireHydrant01.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Pipe04.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Pipe04.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Pipe05.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Pipe05.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Pipe06.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Pipe06.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Pipe07.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Pipe07.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/StreetSign01.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/StreetSign01.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/StreetSign_Blueprint.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/StreetSign_Blueprint.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/BusStop/BusStop_BusStop01_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/BusStop/BusStop_BusStop01_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/BusStop/BusStop_BusStop01_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/BusStop/BusStop_BusStop01_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/BusStop/BusStop_BusStop01_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/BusStop/BusStop_BusStop01_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/BusStop/M_BusStop.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/BusStop/M_BusStop.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Hydrant/Hydrant_low_FireHydrant_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Hydrant/Hydrant_low_FireHydrant_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Hydrant/Hydrant_low_FireHydrant_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Hydrant/Hydrant_low_FireHydrant_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Hydrant/Hydrant_low_FireHydrant_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Hydrant/Hydrant_low_FireHydrant_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Hydrant/M_Hydrant.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Hydrant/M_Hydrant.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/PipeKit01/M_Pipes02.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/PipeKit01/M_Pipes02.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/PipeKit01/Pipes2_low_PipeKit02_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/PipeKit01/Pipes2_low_PipeKit02_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/PipeKit01/Pipes2_low_PipeKit02_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/PipeKit01/Pipes2_low_PipeKit02_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/PipeKit01/Pipes2_low_PipeKit02_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/PipeKit01/Pipes2_low_PipeKit02_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/M_StreetSigns01.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/M_StreetSigns01.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/M_StreetSigns02.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/M_StreetSigns02.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/M_StreetSigns03.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/M_StreetSigns03.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/Signs_StreetSigns01_BaseColor.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/Signs_StreetSigns01_BaseColor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/Signs_StreetSigns01_Normal.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/Signs_StreetSigns01_Normal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/Signs_StreetSigns01_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/StreetSigns01/Signs_StreetSigns01_OcclusionRoughnessMetallic.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/OpenWorldRework.umap
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Levels/OpenWorldRework.umap
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7f9718104bf73e05bab11a98ed8856c6ad4905100fc3c4194654dd75b0056dc9
|
||||
size 66790690
|
||||
oid sha256:0e6999e26fec86f5301865032cb59327770ba52547446ab385b1850b9fee9c8e
|
||||
size 260
|
||||
|
Loading…
Reference in New Issue
Block a user