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

Merge branch 'dev' into UI-designs

Browse Source
This commit is contained in:
Philip W 2023-02-28 15:30:31 +00:00
commit d7c3ebfa74
184 changed files with 1390 additions and 160 deletions
.vsconfig
Art Misc
Kit1.mb
Characters
Merchant.fbxMerchant_low_MerchantMat_BaseColor.pngMerchant_low_MerchantMat_Emissive.pngMerchant_low_MerchantMat_Normal.pngMerchant_low_MerchantMat_OcclusionRoughnessMetallic.png
Concept Art
Modular_test.fbx
Content
Assets
Characters/Goat Enemy
Goat.fbxGoatRefs.purgoat_low_GoatMat_BaseColor.pnggoat_low_GoatMat_Normal.pnggoat_low_GoatMat_OcclusionRoughnessMetallic.png
InventoryImages
Inventory_Symbol.uasset
Objects
Level_1_map
Level_1_Blockout_Cube.uassetLevel_1_Blockout_Cube_001.uassetLevel_1_Blockout_Cube_002.uassetLevel_1_Blockout_Cube_003.uassetLevel_1_Blockout_Cube_004.uassetLevel_1_Blockout_Cube_005.uassetLevel_1_Blockout_Cube_006.uassetLevel_1_Blockout_Cube_007.uassetLevel_1_Blockout_Cube_008.uassetLevel_1_Blockout_Cube_009.uassetLevel_1_Blockout_Cube_010.uassetLevel_1_Blockout_Cube_011.uassetLevel_1_Blockout_Cube_012.uassetLevel_1_Blockout_Cube_013.uassetLevel_1_Blockout_Cube_014.uassetLevel_1_Blockout_Cube_015.uassetLevel_1_Blockout_Cube_016.uassetLevel_1_Blockout_Cube_017.uassetLevel_1_Blockout_Cylinder.uassetLevel_1_Blockout_Cylinder_001.uassetLevel_1_Blockout_Cylinder_002.uassetLevel_1_Blockout_Cylinder_003.uassetLevel_1_Blockout_Cylinder_004.uassetLevel_1_Blockout_Cylinder_005.uassetLevel_1_Blockout_Cylinder_006.uassetLevel_1_Blockout_Cylinder_007.uassetLevel_1_Blockout_Cylinder_008.uassetLevel_1_Blockout_Cylinder_009.uassetLevel_1_Blockout_Cylinder_010.uassetLevel_1_Blockout_Cylinder_011.uassetLevel_1_Blockout_Cylinder_012.uasset
Tutrorial_Assets
Beams_1.uassetBeams_2.uassetPlank_Long.uassetPlank_Short.uassetTutorial_Wood_Texture.uassetlambert1.uasset
tutorial_Wood_Texture
Plank_Long_lambert1_BaseColor.uassetPlank_Long_lambert1_Emissive.uassetPlank_Long_lambert1_Height.uassetPlank_Long_lambert1_Metallic.uassetPlank_Long_lambert1_Normal.uassetPlank_Long_lambert1_OcclusionRoughnessMetallic.uassetPlank_Long_lambert1_Roughness.uasset
BlueprintAI/AI
AIBruh.uassetAIControllerBruh.uasset
Blueprints
Combat_UI
BP_TurnBaseCombatV2.uassetCombatCharacter.uassetCombat_UI.uasset
Inventory_UI
WBP_ItemDisplay.uassetWBP_PlayerInventory.uasset
Merchant/Merchant_UI
BP_OPENDIAL.uassetBP_ShopSelector.uassetWBP_BuyBuff.uassetWBP_BuyHealing.uasset
Player
BP_MyTempCharacter.uasset
StatusEffects
BP_HealOverTime.uassetBP_Thorns.uasset
Status_UI
StatusIcon.uassetStatusIndicator.uasset
BungeeMan
Mat_BungeeMan_Rubber.uasset
Dialogue
DialogueTest.umapNPCTest.uasset
Environment
Test_imports
Modular_test.uassetlambert1.uasset
Tutorial
Plank_Long.uassetPlank_Short.uasset
Tutorial_modular
lambert2.uassetmodularpiece1.uassetmodularpiece10.uassetmodularpiece2.uassetmodularpiece3.uassetmodularpiece4.uassetmodularpiece5.uassetmodularpiece6.uassetmodularpiece7.uassetmodularpiece8.uassetmodularpiece9.uasset
lambert1.uassetlambert2.uassettutorial_level_ceiling.uassettutorial_level_ceiling1.uassettutorial_level_ceiling2.uassettutorial_level_floor.uassettutorial_level_floor1.uassettutorial_level_floor2.uasset
Show More

5
.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"

BIN
Art Misc/Kit1.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Characters/Merchant.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Characters/Merchant_low_MerchantMat_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Characters/Merchant_low_MerchantMat_Emissive.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Characters/Merchant_low_MerchantMat_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Concept Art/Modular_test.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Goat Enemy/Goat.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Goat Enemy/GoatRefs.pur Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/InventoryImages/Inventory_Symbol.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_002.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_003.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_005.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_006.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_007.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_008.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_009.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_010.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_011.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Emissive.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Height.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Metallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Roughness.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/BlueprintAI/AI/AIBruh.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BlueprintAI/AI/AIControllerBruh.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/BP_TurnBaseCombatV2.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/Combat_UI.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/WBP_BuyBuff.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/WBP_BuyHealing.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/Player/BP_MyTempCharacter.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Blueprints/StatusEffects/BP_HealOverTime.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/StatusEffects/BP_Thorns.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Status_UI/StatusIcon.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Blueprints/Status_UI/StatusIndicator.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/BungeeMan/Mat_BungeeMan_Rubber.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Dialogue/DialogueTest.umap (Stored with Git LFS)

Binary file not shown.

BIN
Content/Dialogue/NPCTest.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/Environment/Test_imports/Modular_test.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Test_imports/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Plank_Long.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Plank_Short.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/lambert2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/tutorial_level_ceiling.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/tutorial_level_ceiling1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/tutorial_level_ceiling2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/tutorial_level_floor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/tutorial_level_floor1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Environment/Tutorial/tutorial_level_floor2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More