Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge remote-tracking branch 'origin/Environment-Appartment' into ApartmentCheckpoints

Browse Source 
# Conflicts:
#	EndlessVendetta/Content/Levels/Apartment_hit.umap
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
This commit is contained in:
Rafal Swierczek 2024-04-01 16:35:12 +01:00
commit b17da83843
22 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/LiftButtons_low.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/LiftCeiling_low.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/LiftDoorLeft.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/LiftDoorRight.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/LiftFloor_low.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/M_lift2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/Sheet2_low_LiftParts_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/Sheet2_low_LiftParts_Emissive.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/Sheet2_low_LiftParts_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/Sheet2_low_LiftParts_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Lift/Sm_Lift.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/KitchenFloor/M_KitchenFloor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/KitchenFloor/Panel_Kitchen_Floor_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/KitchenFloor/Panel_Kitchen_Floor_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/KitchenFloor/Panel_Kitchen_Floor_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Lift/LiftKit/Lift_low_LiftKit_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Lift/LiftKit/Lift_low_LiftKit_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Lift/LiftKit/Lift_low_LiftKit_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Lift/LiftKit/M_LiftKit.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/BountySpecificActors/BP_Elevator.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
EndlessVendetta/Content/Levels/Apartment_hit.umap
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:cdb66db8c9eb55e37f771c99de77cda94c4be7286f86722c09ed37cae959e64d oid sha256:95b75f9a1a08c92e493a38a2f257201075afc362b2c91d7c74b3d703f3e6cb42
size 1025737 size 946769

4
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8a755f4e46e2643827d1e2e3a70e001e77f3887ff2309c5100b7d927ff888c34 oid sha256:72bcebfcdf8f1394397cbeff102dfb3c52994a546f876065aeb689f7f9cd0aaa
size 66790690 size 268