Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases1 Activity

Merge remote-tracking branch 'origin/Outside-Lighting-Pass' into ApartmentCheckpoints

Browse Source 
# Conflicts:
#	EndlessVendetta/Content/Levels/OpenWorldRework.umap
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
This commit is contained in:
Rafal Swierczek 2024-04-14 17:48:44 +01:00
commit a9990dd7f2
82 changed files with 210 additions and 45 deletions
EndlessVendetta/Content
Assets
Objects/OpenWorld
BeachfrontArea
M_Road02.uasset
Landscape_Road
newRoad.uasset
OpenWorld
BaseMaterials
Road
M_Road05.uassetplane_standardSurface1_BaseColor.uassetplane_standardSurface1_Normal.uassetplane_standardSurface1_OcclusionRoughnessMetallic.uasset
Sand
M_Sand.uassetSand_BaseColor.uassetSand_Normal.uassetSand_OcclusionRoughnessMetallic.uasset
Decals
M_PuddleDecal.uassetPuddle_graph_Opacity.uassetPuddle_graph_normal.uassetPuddle_graph_roughness.uasset
Props
AcUnit04.uassetBarrier.uassetBin01.uasset
Bin01
Bin01_low_Bin01_BaseColor.uassetBin01_low_Bin01_Normal.uassetBin01_low_Bin01_OcclusionRoughnessMetallic.uassetM_Bin01.uasset
Lampost
Lampost_low_light_low.uassetLampost_low_pole_low.uasset
Textures/Lampost
Lampost_low_Lampost_BaseColor.uassetLampost_low_Lampost_Emissive.uassetLampost_low_Lampost_Normal.uassetLampost_low_Lampost_OcclusionRoughnessMetallic.uassetM_Lampost.uasset
LampostDouble_Blueprint.uassetLampostSingle_Blueprint.uassetRoundBin.uassetSmallSign01.uassetSmallSign2_Blueprint.uasset
Textures
Lampost
Lampost_low_light_low.uassetLampost_low_pole_low.uasset
Signs01
M_Signs01.uassetM_Signs02.uassetM_Signs03.uassetM_Signs04.uassetM_Signs05.uasset
Textures_parts
AcUnit
AcUnit_low_AirConMod01_BaseColor.uassetAcUnit_low_AirConMod01_Normal.uassetAcUnit_low_AirConMod01_OcclusionRoughnessMetallic.uassetM_AcUnit04.uasset
Bin01
Bin01_low_Bin01_BaseColor.uassetBin01_low_Bin01_Normal.uassetBin01_low_Bin01_OcclusionRoughnessMetallic.uassetM_Bin01.uasset
HoloGrams/Grunk
Grunk_Hologram01_Opacity.uassetM_Hologram.uassetPanel_Grunk_Hologram01_Emissive.uasset
JeresyBarrier
Barrier_standardSurface1_BaseColor.uassetBarrier_standardSurface1_Normal.uassetBarrier_standardSurface1_OcclusionRoughnessMetallic.uassetJeresyBarrier.uasset
Lampost
Lampost_low_light_low.uassetLampost_low_pole_low.uasset
Textures/Lampost
Lampost_low_Lampost_BaseColor.uassetLampost_low_Lampost_Emissive.uassetLampost_low_Lampost_Normal.uassetLampost_low_Lampost_OcclusionRoughnessMetallic.uassetM_Lampost.uasset
RoundBin
RoundBin1.uassetRoundBin_RoundBin_BaseColor.uassetRoundBin_RoundBin_Normal.uassetRoundBin_RoundBin_OcclusionRoughnessMetallic.uasset
Signs01
Brackets
Bracket.uassetBracket_low_Brakcet01_BaseColor.uassetBracket_low_Brakcet01_Normal.uassetBracket_low_Brakcet01_OcclusionRoughnessMetallic.uassetM_Bracket.uasset
M_Signs01.uassetM_Signs02.uassetM_Signs03.uassetM_Signs04.uassetM_Signs05.uasset
Maps
Signs01_NeonSigns01_BaseColor.uassetSigns01_NeonSigns01_Emissive.uassetSigns01_NeonSigns01_Normal.uassetSigns01_NeonSigns01_OcclusionRoughnessMetallic.uasset
Levels
OpenWorldRework.umap
StarterContent/Architecture
Floor_400x400.uasset

BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/BeachfrontArea/M_Road02.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/newRoad.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/BaseMaterials/Road/M_Road05.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/BaseMaterials/Road/plane_standardSurface1_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/BaseMaterials/Road/plane_standardSurface1_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/BaseMaterials/Road/plane_standardSurface1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/BaseMaterials/Sand/M_Sand.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/BaseMaterials/Sand/Sand_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/BaseMaterials/Sand/Sand_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/BaseMaterials/Sand/Sand_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Decals/M_PuddleDecal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Decals/Puddle_graph_Opacity.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Decals/Puddle_graph_normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Decals/Puddle_graph_roughness.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/AcUnit04.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Barrier.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Bin01.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Bin01/Bin01_low_Bin01_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Bin01/Bin01_low_Bin01_Normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Bin01/Bin01_low_Bin01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Bin01/M_Bin01.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Lampost/Lampost_low_light_low.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Lampost/Lampost_low_pole_low.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Lampost/Textures/Lampost/Lampost_low_Lampost_BaseColor.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Lampost/Textures/Lampost/Lampost_low_Lampost_Emissive.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Lampost/Textures/Lampost/Lampost_low_Lampost_Normal.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Lampost/Textures/Lampost/Lampost_low_Lampost_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Lampost/Textures/Lampost/M_Lampost.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/LampostDouble_Blueprint.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/LampostSingle_Blueprint.uasset (Stored with Git LFS)

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/RoundBin.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/SmallSign2_Blueprint.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures/Lampost/Lampost_low_light_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures/Lampost/Lampost_low_pole_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures/Signs01/M_Signs01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures/Signs01/M_Signs02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures/Signs01/M_Signs03.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures/Signs01/M_Signs04.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures/Signs01/M_Signs05.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/AcUnit/AcUnit_low_AirConMod01_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/AcUnit/AcUnit_low_AirConMod01_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/AcUnit/AcUnit_low_AirConMod01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/AcUnit/M_AcUnit04.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Bin01/Bin01_low_Bin01_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Bin01/Bin01_low_Bin01_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Bin01/Bin01_low_Bin01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Bin01/M_Bin01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/HoloGrams/Grunk/Grunk_Hologram01_Opacity.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/HoloGrams/Grunk/M_Hologram.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/HoloGrams/Grunk/Panel_Grunk_Hologram01_Emissive.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/JeresyBarrier/Barrier_standardSurface1_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/JeresyBarrier/Barrier_standardSurface1_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/JeresyBarrier/Barrier_standardSurface1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/JeresyBarrier/JeresyBarrier.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Lampost/Lampost_low_light_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Lampost/Lampost_low_pole_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Lampost/Textures/Lampost/Lampost_low_Lampost_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Lampost/Textures/Lampost/Lampost_low_Lampost_Emissive.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Lampost/Textures/Lampost/Lampost_low_Lampost_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Lampost/Textures/Lampost/Lampost_low_Lampost_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Lampost/Textures/Lampost/M_Lampost.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/RoundBin/RoundBin1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/RoundBin/RoundBin_RoundBin_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/RoundBin/RoundBin_RoundBin_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/RoundBin/RoundBin_RoundBin_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Brackets/Bracket.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Brackets/Bracket_low_Brakcet01_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Brackets/Bracket_low_Brakcet01_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Brackets/Bracket_low_Brakcet01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Brackets/M_Bracket.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/M_Signs01.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/M_Signs02.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/M_Signs03.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/M_Signs04.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/M_Signs05.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Maps/Signs01_NeonSigns01_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Maps/Signs01_NeonSigns01_Emissive.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Maps/Signs01_NeonSigns01_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/OpenWorld/Props/Textures_parts/Signs01/Maps/Signs01_NeonSigns01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

4
EndlessVendetta/Content/Levels/OpenWorldRework.umap

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1128b0fb7858ad140ecfd0b10c53412c1827c04986864c6312c2078f0aae1e5b
size 294222486
oid sha256:f0422eee9a7cb3f6e8a6ef4c89e78645e0fe874735bd0e9825cb51d94f570c5b
size 41666092

BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS)

Binary file not shown.