Merge branch 'dev' into Polishing-Checkpoints

2024-05-09 23:44:54 +01:00 · 2024-05-09 23:44:54 +01:00 · b7af83b89d
commit b7af83b89d
parent a7e98f9986 116205228e
69 changed files with 168 additions and 67 deletions
--- a/EndlessVendetta/Content/Assets/InfinityBladeEffects/Effects/FX_Materials/Trails/M_ElementalBeam_01_INST.uasset
+++ b/EndlessVendetta/Content/Assets/InfinityBladeEffects/Effects/FX_Materials/Trails/M_ElementalBeam_01_INST.uasset
--- a/EndlessVendetta/Content/Assets/InfinityBladeEffects/Effects/Masters/M_Add_Trail_2Sided_Pan_Master.uasset
+++ b/EndlessVendetta/Content/Assets/InfinityBladeEffects/Effects/Masters/M_Add_Trail_2Sided_Pan_Master.uasset
--- a/EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02.uasset
+++ b/EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02.uasset
--- a/EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02_Inst.uasset
+++ b/EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02_Inst.uasset
--- a/EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02_Inst1.uasset
+++ b/EndlessVendetta/Content/Assets/Materials/Concrete02/M_Concrete02_Inst1.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/decal_dust.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/decal_dust.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/decal_grunge.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/decals/decal_grunge.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/CORPO_LOGO_hologram.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/CORPO_LOGO_hologram.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_IV_FOOD.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_IV_FOOD.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_LOO_BRAKE.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_LOO_BRAKE.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_corpo_logo.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_corpo_logo.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_poster_IV_FOOD.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/posters/poster_decals/decal_poster_IV_FOOD.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_alpha.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_alpha.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_or.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_or.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_re.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_re.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_ye.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_ye.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet_BaseColor.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet_BaseColor.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet_Normal.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet_Normal.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet_OcclusionRoughnessMetallic.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet_OcclusionRoughnessMetallic.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet_low.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/planet_low.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket_BaseColor.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket_BaseColor.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket_Normal.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket_Normal.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket_OcclusionRoughnessMetallic.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket_OcclusionRoughnessMetallic.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket_low.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rocket_low.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/BUBBLES.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/BUBBLES.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust-png-27.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust-png-27.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_cloud_texture.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_cloud_texture.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_cloud_wind.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_cloud_wind.uasset
--- a/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_wind.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/Tutorial-Level/particle_effects/dust_wind.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Buildings/BillBoard/M_BillBoard.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Buildings/BillBoard/M_BillBoard.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_01_window_blue.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_01_window_blue.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_02_window_blue.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_02_window_blue.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_03_window_blue.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_03_window_blue.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_04_window_blue.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_04_window_blue.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_05_window_blue.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Buildings/becca_textures/building_05_window_blue.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTCOLLUMN1.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTCOLLUMN1.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTCOLLUMN2.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTCOLLUMN2.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTSEATING1.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/MARSCITYBRUTALISTSEATING1.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_BaseColor.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_BaseColor.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_Normal.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_Normal.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_OcclusionRoughnessMetallic.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN1_standardSurface1_OcclusionRoughnessMetallic.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_BaseColor.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_BaseColor.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_Normal.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_Normal.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_OcclusionRoughnessMetallic.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTCOLLUMN2_standardSurface1_OcclusionRoughnessMetallic.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_BaseColor.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_BaseColor.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_Normal.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_Normal.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_OcclusionRoughnessMetallic.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/MARSCITYBRUTALISTSEATING1_standardSurface1_OcclusionRoughnessMetallic.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/bench.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/bench.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/column_01.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/column_01.uasset
--- a/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/column_02.uasset
+++ b/EndlessVendetta/Content/Assets/OpenWorld/Parlour/fountain/column_02.uasset
--- a/EndlessVendetta/Content/Assets/VFX_Megapack_v1/sA_ShootingVfxPack/Materials/M_Basic_Particle.uasset
+++ b/EndlessVendetta/Content/Assets/VFX_Megapack_v1/sA_ShootingVfxPack/Materials/M_Basic_Particle.uasset
--- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset
+++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset
--- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.uasset
+++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.uasset
--- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.uasset
+++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.uasset
--- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.uasset
+++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.uasset
--- a/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorPortrait2.uasset
+++ b/EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorPortrait2.uasset
--- a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.uasset
+++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_CombatTraining_Speach.uasset
--- a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.uasset
+++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.uasset
--- a/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.uasset
+++ b/EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/BlinkGradient.uasset
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/BP_WeaponWorkbench.uasset
--- a/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset
+++ b/EndlessVendetta/Content/FirstPerson/Blueprints/Workbench_WeaponAttachments/Workbench_UI/WBP_Workbench.uasset
--- a/EndlessVendetta/Content/Levels/Apartment_hit.umap
+++ b/EndlessVendetta/Content/Levels/Apartment_hit.umap
--- a/EndlessVendetta/Content/Levels/BBBB.umap
+++ b/EndlessVendetta/Content/Levels/BBBB.umap
--- a/EndlessVendetta/Content/Levels/OpenWorldRework.umap
+++ b/EndlessVendetta/Content/Levels/OpenWorldRework.umap
--- a/EndlessVendetta/Content/StarterContent/Particles/Materials/M_Dust_Particle.uasset
+++ b/EndlessVendetta/Content/StarterContent/Particles/Materials/M_Dust_Particle.uasset
--- a/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/WeaponWorkbenchClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/Workbench&Attachments/WeaponWorkbenchClass.cpp
@ -26,7 +26,6 @@ void AWeaponWorkbenchClass::Tick(float DeltaTime)

 void AWeaponWorkbenchClass::Interact()
 {
-	if (!PlayerCharacterRef->bHasRifle) return;
 	UE_LOG(LogTemp, Display, TEXT("Opening Workbench"));
 	WorkbenchUI();
 }