Merge remote-tracking branch 'origin/Green-Light/Rafals-Branch' into AI

Browse Source

# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset

...

This commit is contained in:

Philip W 2024-02-29 03:49:49 +00:00

parent 90d9fd50a5 664ece2858

commit 82de3a9342

159 changed files with 573 additions and 77 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/Pistol_suppresor/SM_Suppresor.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Pistol_suppresor/Suppresor_low_Suppresor_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Pistol_suppresor/Suppresor_low_Suppresor_Normal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Pistol_suppresor/Suppresor_low_Suppresor_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/SandMaterial_export/Sand_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/SandMaterial_export/Sand_Normal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/SandMaterial_export/Sand_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Textures/Fish/Fish Blue.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Textures/Fish/Fish Gray.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Textures/Fish/Fish Orange.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Textures/Fish/Fish Pink.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/IslandHandle.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/KT_island.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Oven.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Pan.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Materials/Pot.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/KTIsland/SM_KTIsland_IslandHandle_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/KTIsland/SM_KTIsland_IslandHandle_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/KTIsland/SM_KTIsland_IslandHandle_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/KTIsland/SM_KTIsland_KT_island_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/KTIsland/SM_KTIsland_KT_island_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/KTIsland/SM_KTIsland_KT_island_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Oven/SM_Oven2_standardSurface1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Oven/SM_Oven2_standardSurface1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Oven/SM_Oven2_standardSurface1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Pan/SM_Pan_lambert4_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Pan/SM_Pan_lambert4_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Pan/SM_Pan_lambert4_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Pot/SM_Pot_lambert5_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Pot/SM_Pot_lambert5_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Textures/Pot/SM_Pot_lambert5_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/HousePlant/MonestroLeaf/Leafs_MonsteraLeaf_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/HousePlant/MonestroLeaf/Leafs_MonsteraLeaf_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/HousePlant/MonestroLeaf/Leafs_MonsteraLeaf_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/HousePlant/MonestroLeaf/M_Leaf01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/fishtank_wood.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) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fishtank/rock_low_standardSurface1_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) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/BP_HackFinanceLaptop.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_EscapeFinanceCentre.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/CP_HackFinanceLaptop.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/LaptopWidgets/KeyboardDrawing.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/LaptopWidgets/KeyboardDrawing.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/LaptopWidgets/WBP_HackingProgressOnPlayersScreen.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/LaptopWidgets/WBP_HackingScreen.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/LaptopWidgets/WBP_Keyboard.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/MoneyProblems/SB_MoneyProblems.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_EliminateEnemiesAtApartmentComplex.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/CP_GoToPestControl.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/SB_PestControl.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/PestControl/WBP_PestControl.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_EscapeSecurityOffice.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_FindSecurityItem.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_GoToSecurityOffice.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/CP_PickupSecurityItem.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ApartmentBounty/SideBounties/SecuritySpecialists/SB_SecuritySpecialists.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/CheckpointTips/WBP_CheckpointTip.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ControlsTutorial/BP_GunTips.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/BountySystem/ControlsTutorial/Bounty/Checkpoints/CP_LeaveTut.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