Merge branch 'Environment-Appartment' into Bounty-System-Rework

Browse Source

# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/Levels/Apartment_hit.umap

...

This commit is contained in:

Rafal Swierczek 2024-02-01 23:35:34 +00:00

parent 71a416946f 2b559ff268

commit f6e015e029

108 changed files with 318 additions and 12 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/Objects/Tutorial-Level/DoorFrame.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/boiler_room/dryer_low.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