Merge remote-tracking branch 'origin/Merchant' into art-implementation

# Conflicts: # Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset # Content/Blueprints/Player/BP_MyTempCharacter.uasset # Content/Levels/Build.umap # Content/Levels/Top_layer_level.umap # Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-03-13 15:35:46 +00:00 · 2023-03-13 15:35:46 +00:00 · 0146e89f88
commit 0146e89f88
parent 6c3b6b1ad2 3982712189
42 changed files with 120 additions and 12 deletions
--- a/Content/Assets/Characters/Goat_Enemy/GoatMaterial/GoatMat.uasset
+++ b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/GoatMat.uasset
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b1c6e3c94303e24ab1888161a81e1fcce7f5efd83c7460237846ff0b41110e6
+size 14388
--- a/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_BaseColor.uasset
+++ b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_BaseColor.uasset
--- a/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_Normal.uasset
+++ b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_Normal.uasset
--- a/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset
+++ b/Content/Assets/Characters/Goat_Enemy/GoatMaterial/goat_low_GoatMat_OcclusionRoughnessMetallic.uasset
--- a/Content/Assets/Characters/Goat_Enemy/SM_Goat.uasset
+++ b/Content/Assets/Characters/Goat_Enemy/SM_Goat.uasset
--- a/Content/Assets/Characters/Merchant/AMerchant.uasset
+++ b/Content/Assets/Characters/Merchant/AMerchant.uasset
--- a/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset
+++ b/Content/Assets/Characters/Merchant/MerchantMat/MerchantMat.uasset
--- a/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_BaseColor.uasset
+++ b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_BaseColor.uasset
--- a/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_Normal.uasset
+++ b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_Normal.uasset
--- a/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.uasset
+++ b/Content/Assets/Characters/Merchant/MerchantMat/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.uasset
--- a/Content/Assets/Characters/Merchant/Merchant_Body_low.uasset
+++ b/Content/Assets/Characters/Merchant/Merchant_Body_low.uasset
--- a/Content/Assets/Characters/Merchant/Merchant_Boots_low.uasset
+++ b/Content/Assets/Characters/Merchant/Merchant_Boots_low.uasset
--- a/Content/Assets/Characters/Merchant/Merchant_Hair_low.uasset
+++ b/Content/Assets/Characters/Merchant/Merchant_Hair_low.uasset
--- a/Content/Assets/Characters/Merchant/Merchant_Hood_low.uasset
+++ b/Content/Assets/Characters/Merchant/Merchant_Hood_low.uasset
--- a/Content/Assets/Characters/Merchant/Merchant_Sash_low.uasset
+++ b/Content/Assets/Characters/Merchant/Merchant_Sash_low.uasset
--- a/Content/Assets/Characters/Merchant/Merchant_Sleeves_low.uasset
+++ b/Content/Assets/Characters/Merchant/Merchant_Sleeves_low.uasset
--- a/Content/Assets/Characters/Merchant/SM_Merchant.uasset
+++ b/Content/Assets/Characters/Merchant/SM_Merchant.uasset
--- a/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset
+++ b/Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Bag_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Coins_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Crate_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyCube_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Lamp_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionLong_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_PotionRoundB_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Shelves1_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_Table_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel2_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_barrel_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_box_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_bucket_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_bucket_low.uasset
--- a/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset
+++ b/Content/Assets/Objects/MerchantShop/MerchantShopModular_sac_low.uasset
--- a/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset
+++ b/Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset
--- a/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset
+++ b/Content/Blueprints/Merchant/BP_MerchantInteraction.uasset
--- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset
+++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset
--- a/Content/Levels/Build.umap
+++ b/Content/Levels/Build.umap
--- a/Content/Levels/Top_layer_level.umap
+++ b/Content/Levels/Top_layer_level.umap
--- a/Environment/MerchantShopAssets/MerchantShop.mb
+++ b/Environment/MerchantShopAssets/MerchantShop.mb
--- a/Environment/MerchantShopAssets/MerchantShopBlockout.fbx
+++ b/Environment/MerchantShopAssets/MerchantShopBlockout.fbx
--- a/Environment/MerchantShopAssets/MerchantShop_high.fbx
+++ b/Environment/MerchantShopAssets/MerchantShop_high.fbx
--- a/Environment/MerchantShopAssets/MerchantShop_low.fbx
+++ b/Environment/MerchantShopAssets/MerchantShop_low.fbx