Merge branch 'LevelDesign' into Main-Bounty-Update

Browse Source

# Conflicts:
#	EndlessVendetta/Config/DefaultEngine.ini
#	EndlessVendetta/Content/Levels/Apartment_hit.umap
#	EndlessVendetta/Content/Levels/OpenWorldRework.umap
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset

...

This commit is contained in:

Rafal Swierczek 2024-03-20 22:35:26 +00:00

parent e298691255 53bb7a1338

commit 7f46336301

182 changed files with 324 additions and 201 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 Expand all files Collapse all files

BIN

EndlessVendetta/Content/Assets/Blockout/Market.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/ColorFx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/ColorFx001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Fx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/M_CanyonRoad.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Normal_Map.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Occlusion.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Flat/ColorFx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Fx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Flat/M_FlatLandscape.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Normal_Map.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/HIll/ColorFx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Fx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/HIll/M_Hill.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Normal_Map.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Occlusion.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/ColorFx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/M_MountainousTerrain.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/ColorFx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/M_Practice.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/Normal_Map.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/M_RockyTerrace.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/ColorFx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Fx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/M_SideHIll.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Normal_Map.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Occlusion.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/ColorFx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Fx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/M_Underwater.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Normal_Map.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Occlusion.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/ColorFx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/ColorFx_Mat.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Fx.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/NewMaterial.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Normal_Map.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Occlusion.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Connector_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Sm_CornerPiece.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Cyberpunk_Gigapack/Textures/Cyberpunk_Restaurant/T_Graffiti_Decal_13_M.uasset → EndlessVendetta/Content/Assets/Megabuilding/Sm_WindowSmall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Cyberpunk_Gigapack/Textures/Props/T_StandInGrey_B.uasset → EndlessVendetta/Content/Assets/Megabuilding/Textures/Beams/M_MegaBuildingAppartmentBeams.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Beams/beams_low_MegaBuildingAppartmentBeams_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Beams/beams_low_MegaBuildingAppartmentBeams_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Cyberpunk_Gigapack/Textures/Cosmos/T_SharkSight_B.uasset → EndlessVendetta/Content/Assets/Megabuilding/Textures/Beams/beams_low_MegaBuildingAppartmentBeams_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Megapack/Meshes/Yakohama/SM_Balcony_03.uasset → EndlessVendetta/Content/Assets/Megabuilding/Textures/Connector/Connector_low_MegaBuildingAppartmentConnector_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Connector/Connector_low_MegaBuildingAppartmentConnector_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Connector/Connector_low_MegaBuildingAppartmentConnector_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Connector/M_MegaBuildingAppartmentConnector.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Corner/M+MegaBuildingAppartmentCorner.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Corner/corner_low_MegaBuildingAppartmentCorner_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Corner/corner_low_MegaBuildingAppartmentCorner_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Corner/corner_low_MegaBuildingAppartmentCorner_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Windows/M_MegaBuildingAppartmentWindows.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Windows/Window_low_MegaBuildingAppartmentWindow_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Windows/Window_low_MegaBuildingAppartmentWindow_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Textures/Windows/Window_low_MegaBuildingAppartmentWindow_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/Window_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BrutalistLevelKit/Textures/Structure/Buildings/Trims/T_Scaffold_Mesh_N.uasset → EndlessVendetta/Content/Assets/Megabuilding/beams_low.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Megabuilding/corner_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_001.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_002.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_003.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_004.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/Material_005.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Security_office/security_office_door.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece03/M_WallPiece03.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/WallPiece04/M_WallPiece04.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/BO_building_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/BO_building_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/BO_building_03.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/BO_building_04.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/BO_building_05.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/MainTextures/Main_low_MainPiece01_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/MainTextures/Main_low_MainPiece01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/MainTextures/Main_low_MainPiece01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/MainTextures/N_MainBuilding01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/Main_low_Main_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/Main_low_Side03_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/SidesTextures/M_SideBuilding01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/SidesTextures/Sides_low_Sides01_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/SidesTextures/Sides_low_Sides01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/SidesTextures/Sides_low_Sides01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Megapack/Material/Favela/Decals/MI_Graffiti_13.uasset → EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/Sides_low_Side01_low.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01/Sides_low_Side02_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Building01_Blueprint.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Main_low_Main_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Main_low_Side03_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Sides_low_Side01_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/Sides_low_Side02_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Downtown_West/Textures/Decals/T_grunge_decal_b_opacity.uasset → EndlessVendetta/Content/Assets/OpenWorld/Props/Textures/Lampost/Lampost_low_Lampost_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/VFX_Megapack_v1/sA_PickupSet_1/Materials/Textures/T_Beam_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More