Merge branch 'Environment-Miami' into dev

Browse Source

# Conflicts:
#	EndlessVendetta/Content/Levels/OpenWorldRework.umap
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset

...

This commit is contained in:

Louis Horne 2024-05-01 21:21:33 +01:00

parent 59928b697e f1045a6ad3

commit 55cc5e867f

240 changed files with 700 additions and 31 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

Assets/Assault_Riffle/Assault_Riffle_Low.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Glass01/M_Glass01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Glass01/Panel_Glass01_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Glass01/Panel_Glass01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Glass01/Panel_Glass01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Bowl/Dinning_Bowl_Low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Bowl/Dinning_Bowl_Texture/Dinning_Bowl.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Bowl/Dinning_Bowl_Texture/Dinning_Bowl_Low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Bowl/Dinning_Bowl_Texture/Dinning_Bowl_Low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Bowl/Dinning_Bowl_Texture/Dinning_Bowl_Low_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Chair_Legs_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Chair_Legs_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Chair_Legs_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Plastic_Chair_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Plastic_Chair_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Plastic_Chair_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Seat_Padding_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Seat_Padding_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Chair_Low_Seat_Padding_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Dinning_Chair_Legs.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Dinning_Chair_Seat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Chair/Chair_Texture/Dinning_Chair_back.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Falk/Dinning_Falk_Low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Falk/Dinning_Falk_Low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Falk/Dinning_Falk_Low_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Falk/Falk_Low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Knife/Dinning_Knife_Low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Knife/Dinning_Knife_Low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Knife/Dinning_Knife_Low_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Knife/Knife_Low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Knife/Knife_Texture.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Lamp/Dinning_Room_Lamp.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Lamp/Lamp_Low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Lamp/Lamp_Low_Metal_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Lamp/Lamp_Low_Metal_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Lamp/Lamp_Low_Metal_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Pasta_Bowl/Dinning_Pasta_Bowel_Low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Pasta_Bowl/Pasta_Bowl.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Pasta_Bowl/Pasts_Bowl_Low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Pasta_Bowl/Pasts_Bowl_Low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Pasta_Bowl/Pasts_Bowl_Low_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Plate/Dinning_Plate_Low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Plate/Plate_Low_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Plate/Plate_Low_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Plate/Plate_Low_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Glass_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Glass_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Glass_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Trim_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Trim_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Trim_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Wood_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Wood_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dining_Table_Low_Wood_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dinning_Table_red_Detail.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Dinning_Room/Dinning_Table/Dinning_Table_wood.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_opacity_alpha_-_Copy.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/fishtank_glass.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/GarageKit/Garage_Door.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/GarageKit/Garage_Pillar.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/GarageKit/Garage_Portal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/GarageKit/Garage_PortalEmbel.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/GarageKit/Garage_Wall01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/GarageKit/Garage_Wall02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/GarageKit/YellowGarage/Kit01_low_Garage_Yellow_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/GarageKit/YellowGarage/Kit01_low_Garage_Yellow_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

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