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

Merge branch 'Texturing' into dev

Browse Source 
# Conflicts:
#	Content/Levels/Build.umap
This commit is contained in:
MARCEL HARA 2023-05-11 14:06:55 +01:00
commit 83a9e5895e
28 changed files with 69 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Assets/Objects/MerchantShop/Lamp_lamp_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/Lamp_lamp_Emissive.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/Lamp_lamp_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/Lamp_lamp_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/M_Lamp.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/M_shopDecoObjects.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/M_shopWoodObjects.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShop_low_Deco_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/MerchantShop/MerchantShop_low_Wood_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_021.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
Content/Levels/Build.umap
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff98e10e6cf23061099c2518075d96c20903a54184f746077830207953c9ebe3
size 3403556
oid sha256:f8f3b8d12a8db009c3a1592bfe9b9278934454f228864bcfb2fa006deea15275
size 3479967