Merge branch 'Environment-Miami' into dev

Browse Source

...

This commit is contained in:

Louis Horne 2024-05-09 14:48:36 +01:00

parent ff7ef6eb91 ffe1bcd8b8

commit 1588a64727

65 changed files with 161 additions and 62 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/InfinityBladeEffects/Effects/FX_Materials/Trails/M_ElementalBeam_01_INST.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/InfinityBladeEffects/Effects/Masters/M_Add_Trail_2Sided_Pan_Master.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02_Inst.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02_Inst1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_LOO_BRAKE.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_corpo_logo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_poster_IV_FOOD.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_alpha.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_cloud_wind.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)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_01_window_blue.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_02_window_blue.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_03_window_blue.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_04_window_blue.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_05_window_blue.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTCOLLUMN1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTCOLLUMN2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTSEATING1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/bench.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/column_01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/column_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/VFX_Megapack_v1/sA_ShootingVfxPack/Materials/M_Basic_Particle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorPortrait2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Levels/Apartment_hit.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Levels/OpenWorldRework.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/StarterContent/Particles/Materials/M_Dust_Particle.uasset (Stored with Git LFS)

View File

Binary file not shown.