Merge branch 'Tutorial-Enviroment' into dev

Browse Source

# Conflicts:
#	EndlessVendetta/Content/BountySystem/Waypoint/WaypointArrow.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
#	EndlessVendetta/EndlessVendetta.uproject

...

This commit is contained in:

Rafal Swierczek 2024-01-14 22:01:42 +00:00

parent 7fe18c2e8c 6bf2d0e93f

commit 8d0f5534ce

420 changed files with 969 additions and 306 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/Bathroom/Mirror.fbx (Stored with Git LFS)

Binary file not shown.

BIN

Assets/Bathroom/Mirror_Low.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Mirror_Texture/Mirror_Low_standardSurface2_BaseColor.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Mirror_Texture/Mirror_Low_standardSurface2_Normal.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Mirror_Texture/Mirror_Low_standardSurface2_OcclusionRoughnessMetallic.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/SM_Toilet.fbx (Stored with Git LFS)

Binary file not shown.

BIN

Assets/Bathroom/Shower_Export.fbx (Stored with Git LFS)

Binary file not shown.

BIN

Assets/Bathroom/Shower_Low.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Shower_Texture/Shower_Low_standardSurface5_BaseColor.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Shower_Texture/Shower_Low_standardSurface5_Normal.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Shower_Texture/Shower_Low_standardSurface5_OcclusionRoughnessMetallic.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Sink_Export.fbx (Stored with Git LFS)

Binary file not shown.

BIN

Assets/Bathroom/Sink_Low.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Sink_Texture/Sink_Low_lambert1_BaseColor.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Sink_Texture/Sink_Low_lambert1_Normal.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Sink_Texture/Sink_Low_lambert1_OcclusionRoughnessMetallic.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Tap_Export.fbx (Stored with Git LFS)

Binary file not shown.

BIN

Assets/Bathroom/Tap_Low.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Tap_Texture/Tap_Low_lambert1_BaseColor.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Tap_Texture/Tap_Low_lambert1_Normal.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Tap_Texture/Tap_Low_lambert1_OcclusionRoughnessMetallic.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Low.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Button/Toilet_Low_2_Button1_BaseColor.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Button/Toilet_Low_2_Button1_Normal.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Button/Toilet_Low_2_Button1_OcclusionRoughnessMetallic.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Seat/Toilet_Low_2_Seat_BaseColor.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Seat/Toilet_Low_2_Seat_Normal.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Seat/Toilet_Low_2_Seat_OcclusionRoughnessMetallic.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Toilet/Toilet_Low_2_Toilet2_BaseColor.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Toilet/Toilet_Low_2_Toilet2_Normal.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Bathroom/Toilet_Texture/Toilet/Toilet_Low_2_Toilet2_OcclusionRoughnessMetallic.tga (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Materials/Concrete/Plane_lambert1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Materials/Concrete/Plane_lambert1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Materials/Concrete/Plane_lambert1_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/Pistol/SM_Handgun_Untextured.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/sofa_02.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/textures/sofa_02_standardSurface1_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/textures/sofa_02_standardSurface1_Height.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/textures/sofa_02_standardSurface1_Metallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/textures/sofa_02_standardSurface1_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Assets/living room/textures/sofa_02_standardSurface1_Roughness.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Concrete/M_Concrete.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Concrete/Plane_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Concrete/Plane_lambert1_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Materials/Concrete/Plane_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Button/Toilet_Button_Texture.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Button/Toilet_Low_2_Button1_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Button/Toilet_Low_2_Button1_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Button/Toilet_Low_2_Button1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Seat/Toilet_Low_2_Seat_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Seat/Toilet_Low_2_Seat_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Seat/Toilet_Low_2_Seat_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Seat/Toilet_Seat_Texture.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Toilet/Toilet_Low_2_Toilet2_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Toilet/Toilet_Low_2_Toilet2_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet_Texture/Toilet/Toilet_Low_2_Toilet2_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Decals/StellarPoster02/Panel_Stellar02_OcclusionRoughnessMetallic.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