Merge branch 'dev' into UI-designs

2023-02-28 15:30:31 +00:00 · 2023-02-28 15:30:31 +00:00 · d7c3ebfa74
commit d7c3ebfa74
parent 0121622ac3 e8c20e2d67
184 changed files with 1390 additions and 160 deletions
--- a/.vsconfig
+++ b/.vsconfig
@ -1,15 +1,10 @@
 {
  "version": "1.0",
  "components": [
-    "Microsoft.Net.Component.4.6.2.TargetingPack",
-    "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64",
-    "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64",
    "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
    "Microsoft.VisualStudio.Component.Windows10SDK",
    "Microsoft.VisualStudio.Workload.CoreEditor",
-    "Microsoft.VisualStudio.Workload.ManagedDesktop",
-    "Microsoft.VisualStudio.Workload.NativeCrossPlat",
    "Microsoft.VisualStudio.Workload.NativeDesktop",
    "Microsoft.VisualStudio.Workload.NativeGame",
    "Microsoft.VisualStudio.Workload.Universal"
--- a/Misc/Kit1.mb
+++ b/Misc/Kit1.mb
--- a/Characters/Merchant.fbx
+++ b/Characters/Merchant.fbx
--- a/Characters/Merchant_low_MerchantMat_BaseColor.png
+++ b/Characters/Merchant_low_MerchantMat_BaseColor.png
--- a/Characters/Merchant_low_MerchantMat_Emissive.png
+++ b/Characters/Merchant_low_MerchantMat_Emissive.png
--- a/Characters/Merchant_low_MerchantMat_Normal.png
+++ b/Characters/Merchant_low_MerchantMat_Normal.png
--- a/Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png
+++ b/Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png
--- a/Art/Modular_test.fbx
+++ b/Art/Modular_test.fbx
--- a/Content/Assets/Characters/Goat
+++ b/Content/Assets/Characters/Goat
--- a/Content/Assets/Characters/Goat
+++ b/Content/Assets/Characters/Goat
--- a/Enemy/goat_low_GoatMat_BaseColor.png
+++ b/Enemy/goat_low_GoatMat_BaseColor.png
--- a/Enemy/goat_low_GoatMat_Normal.png
+++ b/Enemy/goat_low_GoatMat_Normal.png
--- a/Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png
+++ b/Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png
--- a/Content/Assets/InventoryImages/Inventory_Symbol.uasset
+++ b/Content/Assets/InventoryImages/Inventory_Symbol.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_001.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_001.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_002.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_002.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_003.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_003.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_005.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_005.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_006.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_006.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_007.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_007.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_008.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_008.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_009.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_009.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_010.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_010.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_011.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_011.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset
--- a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset
+++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_BaseColor.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_BaseColor.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Emissive.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Emissive.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Height.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Height.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Metallic.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Metallic.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Normal.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Normal.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_OcclusionRoughnessMetallic.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_OcclusionRoughnessMetallic.uasset
--- a/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Roughness.uasset
+++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Roughness.uasset
--- a/Content/BlueprintAI/AI/AIBruh.uasset
+++ b/Content/BlueprintAI/AI/AIBruh.uasset
--- a/Content/BlueprintAI/AI/AIControllerBruh.uasset
+++ b/Content/BlueprintAI/AI/AIControllerBruh.uasset
--- a/Content/Blueprints/Combat_UI/BP_TurnBaseCombatV2.uasset
+++ b/Content/Blueprints/Combat_UI/BP_TurnBaseCombatV2.uasset
--- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset
+++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset
--- a/Content/Blueprints/Combat_UI/Combat_UI.uasset
+++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset
--- a/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset
+++ b/Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset
--- a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset
+++ b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset
--- a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset
+++ b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset
--- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset
+++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset
--- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset
+++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset
--- a/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset
+++ b/Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset
--- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset
+++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset
--- a/Content/Blueprints/StatusEffects/BP_HealOverTime.uasset
+++ b/Content/Blueprints/StatusEffects/BP_HealOverTime.uasset
--- a/Content/Blueprints/StatusEffects/BP_Thorns.uasset
+++ b/Content/Blueprints/StatusEffects/BP_Thorns.uasset
--- a/Content/Blueprints/Status_UI/StatusIcon.uasset
+++ b/Content/Blueprints/Status_UI/StatusIcon.uasset
--- a/Content/Blueprints/Status_UI/StatusIndicator.uasset
+++ b/Content/Blueprints/Status_UI/StatusIndicator.uasset
--- a/Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
+++ b/Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
--- a/Content/Dialogue/DialogueTest.umap
+++ b/Content/Dialogue/DialogueTest.umap
--- a/Content/Dialogue/NPCTest.uasset
+++ b/Content/Dialogue/NPCTest.uasset
--- a/Content/Environment/Test_imports/Modular_test.uasset
+++ b/Content/Environment/Test_imports/Modular_test.uasset
--- a/Content/Environment/Test_imports/lambert1.uasset
+++ b/Content/Environment/Test_imports/lambert1.uasset
--- a/Content/Environment/Tutorial/Plank_Long.uasset
+++ b/Content/Environment/Tutorial/Plank_Long.uasset
--- a/Content/Environment/Tutorial/Plank_Short.uasset
+++ b/Content/Environment/Tutorial/Plank_Short.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset
--- a/Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset
+++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset
--- a/Content/Environment/Tutorial/lambert1.uasset
+++ b/Content/Environment/Tutorial/lambert1.uasset
--- a/Content/Environment/Tutorial/lambert2.uasset
+++ b/Content/Environment/Tutorial/lambert2.uasset
--- a/Content/Environment/Tutorial/tutorial_level_ceiling.uasset
+++ b/Content/Environment/Tutorial/tutorial_level_ceiling.uasset
--- a/Content/Environment/Tutorial/tutorial_level_ceiling1.uasset
+++ b/Content/Environment/Tutorial/tutorial_level_ceiling1.uasset
--- a/Content/Environment/Tutorial/tutorial_level_ceiling2.uasset
+++ b/Content/Environment/Tutorial/tutorial_level_ceiling2.uasset
--- a/Content/Environment/Tutorial/tutorial_level_floor.uasset
+++ b/Content/Environment/Tutorial/tutorial_level_floor.uasset
--- a/Content/Environment/Tutorial/tutorial_level_floor1.uasset
+++ b/Content/Environment/Tutorial/tutorial_level_floor1.uasset
--- a/Content/Environment/Tutorial/tutorial_level_floor2.uasset
+++ b/Content/Environment/Tutorial/tutorial_level_floor2.uasset
--- a/Show More
+++ b/Show More