Merge branch 'dev' into UI-designs

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
Characters
Concept Art
Content
Assets
Characters/Goat Enemy
InventoryImages
Objects
BlueprintAI/AI
Blueprints
BungeeMan
Dialogue
Environment

@ -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.

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.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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.

Binary file not shown.

BIN
Content/Assets/Objects/Tutrorial_Assets/lambert1.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.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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.

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.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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