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

Browse Source

# Conflicts:
#	EndlessVendetta/Content/Levels/MainMenuLevel.umap

...

This commit is contained in:

Rafal Swierczek 2024-02-29 01:28:40 +00:00

parent fa01239f10 a2d25a40e2

commit 0ddee55593

668 changed files with 6346 additions and 4 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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Objects/SM_Oven_Oven3.uasset (Stored with Git LFS) Normal 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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Kitchen/Objects/SM_Pot.uasset (Stored with Git LFS) Normal 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/HousePlant/M_PlantPot.uasset (Stored with Git LFS) Normal 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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/HousePlant/MonestroLeaf/Leafs_MonsteraLeaf_Normal.uasset (Stored with Git LFS) Normal 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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/HousePlant/MonestroLeaf/M_Leaf01.uasset (Stored with Git LFS) Normal 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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/HousePlant/Plantpot_low_PlantPot_Normal.uasset (Stored with Git LFS) Normal 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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/IK_metahuman.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/MetaHuman_Clothing_LODSettings.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/MetaHuman_ControlRig.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/Mocap/mh_arkit_mapping_anim.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/Mocap/mh_arkit_mapping_pose.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Anger-01_Sternness.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Anger-02_Indignation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Anger-03_Anger.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Anger-04_Rage.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Anger+Disgust--Outrage.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Anger+Fear--Anguish.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Anger+Joy--Cruelty.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Anger+Sadness--Betrayal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Anger+Surprise--Appalled.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Disgust+Fear--Horror.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Disgust+Joy--Ewww.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Disgust+Sadness--PainEmpathy.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Disgust+Surprise--Disbelief.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Fear+Joy--Desperation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/MetaHumans/Common/Common/PoseLibrary/Face/Expressions/Combinations/Fear+Sadness--Devastation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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