diff --git a/.vsconfig b/.vsconfig index b9be525..cf3175a 100644 --- 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" diff --git a/Art Misc/Kit1.mb b/Art Misc/Kit1.mb new file mode 100644 index 0000000..eca3777 --- /dev/null +++ b/Art Misc/Kit1.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57f2f86b4123e0fbce94991353b5b862797c0e11c532b881e625a4f5e4c05e3b +size 20360220 diff --git a/Characters/Merchant.fbx b/Characters/Merchant.fbx new file mode 100644 index 0000000..e0eed40 --- /dev/null +++ b/Characters/Merchant.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32fcd3404a48e84cadf20b5db9969bbc9f652573eb2a943ba25900d1515b2a07 +size 348064 diff --git a/Characters/Merchant_low_MerchantMat_BaseColor.png b/Characters/Merchant_low_MerchantMat_BaseColor.png new file mode 100644 index 0000000..9772fd1 --- /dev/null +++ b/Characters/Merchant_low_MerchantMat_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a03401f9644430344fce3047cfce057f08717a356cc5f62e4695b179442ceeee +size 612188 diff --git a/Characters/Merchant_low_MerchantMat_Emissive.png b/Characters/Merchant_low_MerchantMat_Emissive.png new file mode 100644 index 0000000..75a4bfa --- /dev/null +++ b/Characters/Merchant_low_MerchantMat_Emissive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:766ed13d904fbae3073b78eb5acc7f332e174b1ffc207daf1b4ba6b22385c3fd +size 12332 diff --git a/Characters/Merchant_low_MerchantMat_Normal.png b/Characters/Merchant_low_MerchantMat_Normal.png new file mode 100644 index 0000000..cab8fe7 --- /dev/null +++ b/Characters/Merchant_low_MerchantMat_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b1551cecff0bd6c10a4d31ed58cfb2a729507de4d14306c730076f081aa3ecd +size 2230676 diff --git a/Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png b/Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..3a1398c --- /dev/null +++ b/Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9798fb96e69788e04e39f8ade8b3066da9760508cf10540d2088e12bc40bd5a8 +size 1990806 diff --git a/Concept Art/Modular_test.fbx b/Concept Art/Modular_test.fbx new file mode 100644 index 0000000..e747ff6 --- /dev/null +++ b/Concept Art/Modular_test.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a27b18aaea5148a888ee2f090bea0aadb3ce7402ed9039297cdd3ea685c93a09 +size 24272 diff --git a/Content/Assets/Characters/Goat Enemy/Goat.fbx b/Content/Assets/Characters/Goat Enemy/Goat.fbx new file mode 100644 index 0000000..5e64ed8 --- /dev/null +++ b/Content/Assets/Characters/Goat Enemy/Goat.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24b03def2a74fbf6dedc8e22eebca61134debf7da447b51b36c3d90f3549ad7c +size 283520 diff --git a/Content/Assets/Characters/Goat Enemy/GoatRefs.pur b/Content/Assets/Characters/Goat Enemy/GoatRefs.pur new file mode 100644 index 0000000..f46fb17 Binary files /dev/null and b/Content/Assets/Characters/Goat Enemy/GoatRefs.pur differ diff --git a/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_BaseColor.png b/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_BaseColor.png new file mode 100644 index 0000000..7d4e308 --- /dev/null +++ b/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:986297f9a32ecb9f3fed028dcdd499b64c3876d1238ae09b1b10256d45f2b8c4 +size 543571 diff --git a/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_Normal.png b/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_Normal.png new file mode 100644 index 0000000..4574170 --- /dev/null +++ b/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d59b2da6ea2064f23877867f90c8953ae017b1b8c05ff8c9baf7ba64cebe4c1 +size 2093654 diff --git a/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png b/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png new file mode 100644 index 0000000..96286e2 --- /dev/null +++ b/Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6293fa94447f58239fdcad0c947e61073e1a429c4cb8d3692bee642cae344936 +size 1780757 diff --git a/Content/Assets/InventoryImages/Inventory_Symbol.uasset b/Content/Assets/InventoryImages/Inventory_Symbol.uasset new file mode 100644 index 0000000..9c5d81b --- /dev/null +++ b/Content/Assets/InventoryImages/Inventory_Symbol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17ad8e42d378efdf9681be346150baae8974cd71eb4cac8dd0072c9c7820de89 +size 100650 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset new file mode 100644 index 0000000..0d18336 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a95745ea8a296b31278acd7e46667601fe316d9fb08c093fc88e1bb0879bb3ed +size 16844 diff --git 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 new file mode 100644 index 0000000..b0b12a1 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b86bec51a4845d75972b998fc709f5abfc4998f31b855d6702b8945b358f327 +size 17109 diff --git 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 new file mode 100644 index 0000000..c9f4532 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d3bc405b7a51d8e97edc75085210b5ba1063dc0afc444552a3a473c9f8b46db +size 17175 diff --git 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 new file mode 100644 index 0000000..df04844 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e8eff635690293d4a47eb566e1418becc16425ba3045b9427ba4486b1a73a00 +size 17318 diff --git 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 new file mode 100644 index 0000000..1537265 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20a16d5d0bc9d37e73882e26d0dae584acb5eaa74246450c0d45847f9448c3bd +size 17950 diff --git 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 new file mode 100644 index 0000000..acd39cb --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4f56b1745ea5b597f6d183d03dc32d60f6f11b5606568fbb52cf6edd2d2a7e6 +size 16858 diff --git 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 new file mode 100644 index 0000000..10e3da7 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eece0d2a163e96c73ebb707cbe21666110e5394355c7d54e6e96776deab4946 +size 16857 diff --git 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 new file mode 100644 index 0000000..46fe444 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bf359823025dea250b69ae27d0ada25e066a6a31feab91895647428911421b9 +size 16860 diff --git 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 new file mode 100644 index 0000000..7d8f0f5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f06f07681273830fef43d0a07b19d8b88d38f37e9ca65b5c1930e8717965406 +size 16857 diff --git 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 new file mode 100644 index 0000000..85ec4d7 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3700c42cc4eb65fc776391524287a6e13508d8f5651f2e02a00bc427eb2278c +size 17382 diff --git 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 new file mode 100644 index 0000000..e80eac9 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5307578a83982ee7e4cc0fe9d27a9d26de321e3203e73f326253471f185db32 +size 17384 diff --git 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 new file mode 100644 index 0000000..55be96d --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1cf1c6c455a349c90e8dd13fcd67356050e5ec47245bf37446e635890a6f2ef +size 17384 diff --git 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 new file mode 100644 index 0000000..30809c5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23684996f04fe79951abfc0a5f58e629cee04195caa5f0689f3469bc92ea7f4a +size 17929 diff --git 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 new file mode 100644 index 0000000..44e5947 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_013.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:522fe46835892c46b16af47dc7def4a0a6f5118ab138ca0c72f30f0d58b5c4ec +size 17855 diff --git 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 new file mode 100644 index 0000000..e702f0c --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_014.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a59ce6952a7402239f87ab528632958f444d793f871c847296c8f80d9741789a +size 17782 diff --git 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 new file mode 100644 index 0000000..e5dabd5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_015.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:213656211e7581df746b95506799e6552a137c060ee015e6ef4c7f41761ba9a8 +size 18015 diff --git 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 new file mode 100644 index 0000000..06d81f9 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_016.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88dfe8a0823e46da02fdd2eb2416dca43c8240573f681ad82931444958634494 +size 18003 diff --git 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 new file mode 100644 index 0000000..0a1dd8a --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cube_017.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a26e514cfc96789af8d17045d9516997fdf086b5f2dcb201558c38d6403f370f +size 17737 diff --git a/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset new file mode 100644 index 0000000..e2f1002 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:176484469060dc39cc2fea494005d8fa339b26a8994a6307bb68c1ecf3b0d67d +size 50195 diff --git 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 new file mode 100644 index 0000000..e4b8048 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffebeb122c3dca9693784077235519f068d63f2c77f63c5d339da6861a037fc8 +size 29000 diff --git 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 new file mode 100644 index 0000000..7770d8e --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c68569effbad32832803338b4e5350f16f0f972e0d7e5c0161c9ca12c3e0ece +size 21376 diff --git 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 new file mode 100644 index 0000000..692dde8 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_003.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5944f85bcf6d7293dc81f1b5848700259e424af9759e38e6891d03e7fe8963c5 +size 21654 diff --git 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 new file mode 100644 index 0000000..1aa1334 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34165c8230dbff470aec6fd22a429b7b535067b17a8d225fdd11fdbea8ca625e +size 24389 diff --git 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 new file mode 100644 index 0000000..c94018d --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_005.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e0caeca66276cf19a8db4adc8369c109c0ee69bde920c6112f6eb43cc111a75 +size 30501 diff --git 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 new file mode 100644 index 0000000..87eaa05 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_006.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45c909fde1b3f54c1308fc5fd18b786747b71b0e4fc4f98cdc5513069c5979b5 +size 40886 diff --git 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 new file mode 100644 index 0000000..ccac7f5 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_007.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67e42403d5c1aa4554ce6459d1b8a02924f380dd9747ab192aa052c8f60f306f +size 40798 diff --git 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 new file mode 100644 index 0000000..f187917 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:540af10c95a5e64b010a1779411ec2dd05b719191a67459f7bb063731b3f0e7c +size 40762 diff --git 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 new file mode 100644 index 0000000..7dc4c9f --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b0938c45e73e7250c48852337df96d991b92116ffb49fb87bc38ad7f3f41cf2 +size 40755 diff --git 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 new file mode 100644 index 0000000..dd52007 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_010.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58ce742eec39558ca421a55282c5adb12e45734b2bb328913a53c98a7b814810 +size 40782 diff --git 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 new file mode 100644 index 0000000..601dcd0 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_011.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ba7abc708fd690effce74f13d5b4170d26013130fbc47dbd60cdfba6e6708dc +size 40760 diff --git 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 new file mode 100644 index 0000000..8f94ab7 --- /dev/null +++ b/Content/Assets/Objects/Level_1_map/Level_1_Blockout_Cylinder_012.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1d83b37fc5f73294fecb3f9d26e5d367629fb976cb6649c9ab3118a3fb6059b +size 40729 diff --git a/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset b/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset new file mode 100644 index 0000000..e86e78d --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29889c0b1d2b59e6b330b3bbe1d5273d0a2a1a643a3a027599ea5b851dc741a5 +size 22060 diff --git a/Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset b/Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset new file mode 100644 index 0000000..ca55522 --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91890c845a0f1cca73d0a6c0fc165670ed4211758f4634f4afe2ecb850c45c7b +size 20440 diff --git a/Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset b/Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset new file mode 100644 index 0000000..16293cb --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88408564caf457c4258988bcf983ddc817895c1adb254d263201d687b4f670d0 +size 23440 diff --git a/Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset b/Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset new file mode 100644 index 0000000..02ceefe --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cf1a45619eb9d15dc68479e450f18eb2bf9dacb99d527e09e85acf55f1acdf8 +size 22182 diff --git a/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset new file mode 100644 index 0000000..a617292 --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:504f26d741fa993fe75ec4eebbc21f70e68594710a89d630c468c8f0d95f392e +size 14063 diff --git a/Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset b/Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset new file mode 100644 index 0000000..1bca1f3 --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e8b8c1b145322ec2521575b1a6e6c6d50f833e698c2ae7f1d9fb368fdae7845 +size 8084 diff --git 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 new file mode 100644 index 0000000..cd658be --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be624851da76366f9cc426347a57b7648fc60bfa3abf7b2bd62ec9da43673736 +size 7878079 diff --git 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 new file mode 100644 index 0000000..9017f60 --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Emissive.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:297a02274284a43aadbee6a518a3184c04db99e52a0ca9c2f438f79a8353f596 +size 17303 diff --git 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 new file mode 100644 index 0000000..95be29a --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Height.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c2d6c23ac8528453b134e6c5906de23b36d3dd73971dec5b33c47feec11e071 +size 226926 diff --git 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 new file mode 100644 index 0000000..a7d0dcf --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Metallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea8cec6c392c5d05640b2d686dc452c50fd2627a3bf4c05bfd85fc7a1b17bfd2 +size 11708 diff --git 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 new file mode 100644 index 0000000..c2e81d2 --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13261720f0b55ba6c8e8010b57fb0373fa71d57e6b2a92d47509c02b6b078702 +size 56459 diff --git 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 new file mode 100644 index 0000000..67ee637 --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0a575c18c131073073552ebd3326769caad93fd829a081d889626f93722bb95 +size 56630 diff --git 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 new file mode 100644 index 0000000..2d85f1c --- /dev/null +++ b/Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f943f70100559d911172ec929b011e67b251c3f7df35ac97ce9bdb876be9fb5 +size 12006 diff --git a/Content/BlueprintAI/AI/AIControllerBruh.uasset b/Content/BlueprintAI/AI/AIControllerBruh.uasset index 80d88e1..9737754 100644 --- a/Content/BlueprintAI/AI/AIControllerBruh.uasset +++ b/Content/BlueprintAI/AI/AIControllerBruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3bf037902c2aa1ed7ada853c5c16a27b948ee58bab4fec7dfc395a7003cd94c -size 97758 +oid sha256:c5fd648c575abc38b53e4d6f99f64a879b19c0672c2fa6a97e77cea008fad1dd +size 98856 diff --git a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset index 984f8e0..2a91515 100644 --- a/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset +++ b/Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3940f6af26ff8d95d3e97b80d27b253544786ead926e582015eb17fb8da42daf -size 111618 +oid sha256:fd6ffc07b98733694c91e0765050ee36312bbf61a6766e7561a2fcfd4cfafeef +size 134102 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index b161173..3667ddf 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e348a27c5a931226dba531ec739fec1e28b9f912e91b46078ed811fe50f06bd -size 54956 +oid sha256:f2a39b15f6e64703046d9cb9b437b04838acc10eb1f1465c94bd6d8b2c4395ed +size 55131 diff --git a/Content/Dialogue/DialogueTest.umap b/Content/Dialogue/DialogueTest.umap index f2a5797..9ce057c 100644 --- a/Content/Dialogue/DialogueTest.umap +++ b/Content/Dialogue/DialogueTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f2c0cc2d73c9fd35cf193c48ae0546bd41a9a10dedfe8c60d504fe09b55e819 -size 41343 +oid sha256:10874d3de45d0093660a3b6e12561bc69214daafe2cd3072f9574c83f6cbc5d1 +size 40398 diff --git a/Content/Environment/Test_imports/Modular_test.uasset b/Content/Environment/Test_imports/Modular_test.uasset new file mode 100644 index 0000000..c1122dd --- /dev/null +++ b/Content/Environment/Test_imports/Modular_test.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ed15571c85e9a6ab63980c19a7314360731247545600378ea936e510c3a7da8 +size 20391 diff --git a/Content/Environment/Test_imports/lambert1.uasset b/Content/Environment/Test_imports/lambert1.uasset new file mode 100644 index 0000000..03b04d1 --- /dev/null +++ b/Content/Environment/Test_imports/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b959b4cb13c44a109c99cdd2fbb1441fb4cc91dfa47b061241e753803e40e5c +size 8066 diff --git a/Content/Environment/Tutorial/Plank_Long.uasset b/Content/Environment/Tutorial/Plank_Long.uasset new file mode 100644 index 0000000..a235159 --- /dev/null +++ b/Content/Environment/Tutorial/Plank_Long.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14d21b1fe213f9f96498b4e2e1797816ce2a4c009b311fc5eecda958063ae8d8 +size 23469 diff --git a/Content/Environment/Tutorial/Plank_Short.uasset b/Content/Environment/Tutorial/Plank_Short.uasset new file mode 100644 index 0000000..43dd8ae --- /dev/null +++ b/Content/Environment/Tutorial/Plank_Short.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07061801ea63e6723ed0f34818d256f8b4f4eaa7dfd5fe8d1aedc5a5eb82b9ee +size 22206 diff --git a/Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset b/Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset new file mode 100644 index 0000000..866c69f --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:519703def68f27b50639cca766de68f39d55f3e2687b4d324c833ef5cbe5fbd0 +size 8077 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset new file mode 100644 index 0000000..092c04f --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55cef05963a5155f0d34519819856395cb314681343cfb1990ec4b7f24066cd3 +size 19704 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset new file mode 100644 index 0000000..006208a --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:361b1738dbc36912b962104512d55621eb8f223e6c5145c95b8aecd43ad43c1c +size 28433 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset new file mode 100644 index 0000000..6f82288 --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70734c342ad9269eb86076147cb8563a178cc5cd223c440cea88eb1a97bead96 +size 24823 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset new file mode 100644 index 0000000..11edbdf --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53dc80831670680d50a5058d14db588a58bcc9173bf0eb1cb838f7b972bcfffe +size 21139 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset new file mode 100644 index 0000000..a466491 --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d4ac227909d8ccdb26306bd027dd85edff723c2553fb904d4fc15251d0eedbb +size 27114 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset new file mode 100644 index 0000000..b5fee80 --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37b61429833a9934ce427377e91e469d0bcc600bbd759b93abd70dad79dbbc42 +size 31470 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset new file mode 100644 index 0000000..8b3ebbe --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c62b97703f948ebc1acf1807e23b39f8075b35ae8ac7d7e06feff7f19aadfdbd +size 23262 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset new file mode 100644 index 0000000..44763f2 --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15d819406573f45a94ed04f5dce1e74dafff7d1082ad4e3d20a6fd825e80f88b +size 31532 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset new file mode 100644 index 0000000..bfd2f69 --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45bd11c5b8140d5bcba016d78aafc52797e1bc7dbe1be40cf1b6e949501c86e2 +size 18375 diff --git a/Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset b/Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset new file mode 100644 index 0000000..fa6a6ca --- /dev/null +++ b/Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:becad27519d8f3c03da34d886a2ff72a855f23713206290c15daf34b2a409f3f +size 24656 diff --git a/Content/Environment/Tutorial/lambert1.uasset b/Content/Environment/Tutorial/lambert1.uasset new file mode 100644 index 0000000..d0a0eac --- /dev/null +++ b/Content/Environment/Tutorial/lambert1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3c9293f7153f1bb1dcedf4a478bd2b57d44fa758f5e8d7cea4e058251d007f7 +size 8052 diff --git a/Content/Environment/Tutorial/lambert2.uasset b/Content/Environment/Tutorial/lambert2.uasset new file mode 100644 index 0000000..529f20b --- /dev/null +++ b/Content/Environment/Tutorial/lambert2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16b69935e64e068253365e1c7af9e390ce24fbf14631054cae5dab165eba6514 +size 8054 diff --git a/Content/Environment/Tutorial/tutorial_level_ceiling.uasset b/Content/Environment/Tutorial/tutorial_level_ceiling.uasset new file mode 100644 index 0000000..c25aa41 --- /dev/null +++ b/Content/Environment/Tutorial/tutorial_level_ceiling.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f338118b96b39df7ed6b7308fb88988eca6966f3019ac49e6b027b0018ea9c5e +size 57139 diff --git a/Content/Environment/Tutorial/tutorial_level_ceiling1.uasset b/Content/Environment/Tutorial/tutorial_level_ceiling1.uasset new file mode 100644 index 0000000..fbd3df5 --- /dev/null +++ b/Content/Environment/Tutorial/tutorial_level_ceiling1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:191718a06a2ea3cfba18ccc2da40a50b0edb10d27fea08ddd04b57599c59471f +size 36987 diff --git a/Content/Environment/Tutorial/tutorial_level_ceiling2.uasset b/Content/Environment/Tutorial/tutorial_level_ceiling2.uasset new file mode 100644 index 0000000..a5da411 --- /dev/null +++ b/Content/Environment/Tutorial/tutorial_level_ceiling2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79b3ce67c13aad04651e5945b4d59dfbd9e7044afb9b8a964cc442d91605906e +size 41587 diff --git a/Content/Environment/Tutorial/tutorial_level_floor.uasset b/Content/Environment/Tutorial/tutorial_level_floor.uasset new file mode 100644 index 0000000..426ce47 --- /dev/null +++ b/Content/Environment/Tutorial/tutorial_level_floor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef47c2b4ea9222231c14a95e4d072d0e03e6f5c9485735118bf1ead84977ea1c +size 63591 diff --git a/Content/Environment/Tutorial/tutorial_level_floor1.uasset b/Content/Environment/Tutorial/tutorial_level_floor1.uasset new file mode 100644 index 0000000..64202c3 --- /dev/null +++ b/Content/Environment/Tutorial/tutorial_level_floor1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f40a88a34c17c952ef4010a7be89e5195ea0fd9c4875f716caced4e7ed8162a2 +size 106176 diff --git a/Content/Environment/Tutorial/tutorial_level_floor2.uasset b/Content/Environment/Tutorial/tutorial_level_floor2.uasset new file mode 100644 index 0000000..4308c48 --- /dev/null +++ b/Content/Environment/Tutorial/tutorial_level_floor2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e2bb1b9921244419bbe286628bec44f9c85d36c19fe1ccb5d2fb6d475d97ae6 +size 36749 diff --git a/Content/Levels/Hub.umap b/Content/Levels/Hub.umap index ec5a412..d087c0a 100644 --- a/Content/Levels/Hub.umap +++ b/Content/Levels/Hub.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6988da9e0a0dcd9548ca16b4e663f79e07d90e1805b363dd82d8d3c0f15057ad -size 69244 +oid sha256:be6f9443f989aac1fde2b33c5f3bd02e18cc035bdf641eea6e49ed63b1b9ae4c +size 853427 diff --git a/Content/Levels/Level_1.umap b/Content/Levels/Level_1.umap new file mode 100644 index 0000000..6c1264d --- /dev/null +++ b/Content/Levels/Level_1.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54e9e04e1be101f10e16c86b4118edb28493f0a035ba04833141245596ed5939 +size 75703 diff --git a/Content/Levels/Testing/SneakMechanicTesting.umap b/Content/Levels/Testing/SneakMechanicTesting.umap new file mode 100644 index 0000000..e2cea40 --- /dev/null +++ b/Content/Levels/Testing/SneakMechanicTesting.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d44e1d44549e6cd4deb70fd46d4a804ad1ca3081b495b51f9258da3d741d6ab6 +size 36264 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index dbb4467..aa9063c 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ddfcf9a4f7c3b3ab626893a0d6d13cac4483f9a471bbdba97d0d00efc563dd7 -size 248803 +oid sha256:b669fa5c78fb0e7924a4d8bd4e64f6764e093f9ac5a0a8575342fadb5d45fa47 +size 245297 diff --git a/Content/Levels/Tutorial.umap b/Content/Levels/Tutorial.umap new file mode 100644 index 0000000..65886bd --- /dev/null +++ b/Content/Levels/Tutorial.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43dc47aa1d087a7838f2f66ba03dbbd9ff8b82579c43989fe1843b225c14d0f9 +size 269010 diff --git a/Content/Levels/_GENERATED/tr258492/Boolean_227A3118.uasset b/Content/Levels/_GENERATED/tr258492/Boolean_227A3118.uasset new file mode 100644 index 0000000..9bcd7eb --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Boolean_227A3118.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95a5e23adcc7c8b5fd6d5147cf80beb11961b30ec59a9e8b312dd0048fb563ff +size 14986 diff --git a/Content/Levels/_GENERATED/tr258492/Boolean_8613293A.uasset b/Content/Levels/_GENERATED/tr258492/Boolean_8613293A.uasset new file mode 100644 index 0000000..4cd3803 --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Boolean_8613293A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b2e60c2b086ec4aae6cbf239e722603883432dfd3b2f077d2f73a5af1070231 +size 13480 diff --git a/Content/Levels/_GENERATED/tr258492/Box_0AF9695A.uasset b/Content/Levels/_GENERATED/tr258492/Box_0AF9695A.uasset new file mode 100644 index 0000000..be96908 --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Box_0AF9695A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0c0c9e32613c3957933db8d898f3e73d6f3798ebc8a3d3f8500986282bc6726 +size 13499 diff --git a/Content/Levels/_GENERATED/tr258492/Box_481BA8EA.uasset b/Content/Levels/_GENERATED/tr258492/Box_481BA8EA.uasset new file mode 100644 index 0000000..123e9fc --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Box_481BA8EA.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fef6cdb331ab103ff5eaf4168b2f092dc74e9ea2de53c5a13a2f43feefc2698 +size 13505 diff --git a/Content/Levels/_GENERATED/tr258492/Box_57F24318.uasset b/Content/Levels/_GENERATED/tr258492/Box_57F24318.uasset new file mode 100644 index 0000000..3eab495 --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Box_57F24318.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52471fa2b49c5603f2122fc56b2cabc528079f8b62901b75376cfc073512f3dc +size 13505 diff --git a/Content/Levels/_GENERATED/tr258492/Box_F1F2469E.uasset b/Content/Levels/_GENERATED/tr258492/Box_F1F2469E.uasset new file mode 100644 index 0000000..7999ef6 --- /dev/null +++ b/Content/Levels/_GENERATED/tr258492/Box_F1F2469E.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66a480d98451df5d2a08e53329d958deb83d151eef4a2675da08f7725bf2c312 +size 13505 diff --git a/Misc/Additional Resources/Links To Additional Resources.txt b/Misc/Additional Resources/Links To Additional Resources.txt index 51cbe97..26066be 100644 --- a/Misc/Additional Resources/Links To Additional Resources.txt +++ b/Misc/Additional Resources/Links To Additional Resources.txt @@ -1,8 +1,11 @@ -Combat Spread Sheet: -https://docs.google.com/spreadsheets/d/1s_uxjS8ir1pbt4-ofdOVpSPaQZVC8x9gQzS78bzE3KI/edit#gid=0 -https://docs.google.com/document/d/1Y6eYoKQPw9n8gl7p030fmtPjfJcE132YHAvwL7Gk4jk/edit +Combat Spread Sheet: https://docs.google.com/spreadsheets/d/1s_uxjS8ir1pbt4-ofdOVpSPaQZVC8x9gQzS78bzE3KI/edit?usp=sharing + +Combat Word Doc: https://docs.google.com/document/d/1Y6eYoKQPw9n8gl7p030fmtPjfJcE132YHAvwL7Gk4jk/edit?usp=sharing + +Enemy Spread Sheet: https://docs.google.com/spreadsheets/d/1NsmF43HhB2W9_BrQazy-rpT-GDlIZIQlLdvG18DWlkA/edit?usp=sharing + Level Blueprints - https://docs.google.com/presentation/d/1ckx8IpO-BIxTFy19MJoUy7EuAMYOYoWQE6x1E2egr1o/edit?usp=sharing diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index af4c7ba..db464e5 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -35,15 +35,15 @@ void UDialogueNPC::BeginPlay() void UDialogueNPC::NextDialogue() { //Dialogue Skip - if (CurrentDialogue.Len() < Dialogue[DialogueIndex].Len()) + if (CurrentDialogue.Len() < CurrentDialoguePath[DialogueIndex].Len()) { - CurrentDialogue = Dialogue[DialogueIndex]; + CurrentDialogue = CurrentDialoguePath[DialogueIndex]; DialogueText->SetText(FText::FromString(CurrentDialogue)); return; } DialogueIndex++; - if (DialogueIndex >= Dialogue.Num()) + if (DialogueIndex >= CurrentDialoguePath.Num()) { EndDialogue(); return; @@ -53,11 +53,11 @@ void UDialogueNPC::NextDialogue() void UDialogueNPC::NextCharacter() { - if (DialogueIndex >= Dialogue.Num()) return; + if (DialogueIndex >= CurrentDialoguePath.Num()) return; - if (CurrentDialogue.Len() < Dialogue[DialogueIndex].Len()) + if (CurrentDialogue.Len() < CurrentDialoguePath[DialogueIndex].Len()) { - CurrentDialogue.AppendChar(Dialogue[DialogueIndex][CurrentDialogue.Len()]); + CurrentDialogue.AppendChar(CurrentDialoguePath[DialogueIndex][CurrentDialogue.Len()]); DialogueText->SetText(FText::FromString(CurrentDialogue)); } } @@ -86,6 +86,7 @@ void UDialogueNPC::StartDialogue() DialogueIndex = 1; NPCNameText->SetText(FText::FromString(NPCName)); CurrentDialogue = ""; + CurrentDialoguePath = DialoguePaths[0].Dialogue; GetWorld()->GetTimerManager().SetTimer(TextAnimationTimerHandle, this, &UDialogueNPC::NextCharacter, TextAnimationSpeed, true); } @@ -105,14 +106,42 @@ void UDialogueNPC::EndDialogue() PlayerController->bShowMouseCursor = false; } -TArray UDialogueNPC::AddDialogue(FText TextInput, TArray DialogueArrayInput) +FDialoguePath UDialogueNPC::CreateRootDialoguePath() { - if (TextInput.IsEmpty()) return DialogueArrayInput; - DialogueArrayInput.Add(TextInput.ToString()); - return DialogueArrayInput; + return FDialoguePath(); +} + +FDialoguePath UDialogueNPC::CreateDialoguePath(FDialoguePath ParentDialoguePath) +{ + return FDialoguePath("#" + FString::FromInt(DialoguePaths.Num())); +} + +FDialoguePath UDialogueNPC::CreateDialogueChoice(FDialoguePath PreviousDialoguePath) +{ + return FDialoguePath(); +} + +bool UDialogueNPC::GotoDialoguePath(FString PathId) +{ + for (FDialoguePath DialogPath : DialoguePaths) + { + if (DialogPath.Dialogue[0] == PathId) + { + CurrentDialoguePath = DialogPath.Dialogue; + return true; + } + } + return false; +} + +FDialoguePath UDialogueNPC::AddDialogue(FText TextInput, FDialoguePath DialoguePath) +{ + if (TextInput.IsEmpty()) return DialoguePath; + DialoguePath.Dialogue.Add(TextInput.ToString()); + return DialoguePath; } void UDialogueNPC::GetFinalDialogue(TArray DialogueArray) { - Dialogue = DialogueArray; + DialoguePaths.Add(FDialoguePath(DialogueArray)); } diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h index eeb8276..4b6f2f9 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h @@ -16,6 +16,30 @@ enum class EChoices : uint8 Choice3 UMETA(DisplayName="Choice 3"), }; +USTRUCT(BlueprintType) +struct FDialoguePath +{ + GENERATED_BODY() + + UPROPERTY() + TArray Dialogue; + + FDialoguePath() + { + Dialogue.Add("#ROOT"); + } + + FDialoguePath(FString Id) + { + Dialogue.Add(Id); + } + + explicit FDialoguePath(TArray Dialogue) + { + this->Dialogue = Dialogue; + } +}; + UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) class THE_TWILIGHT_ABYSS_API UDialogueNPC : public UActorComponent { @@ -29,7 +53,9 @@ public: FString NPCName; UPROPERTY() - TArray Dialogue; + TArray DialoguePaths; + + TArray CurrentDialoguePath; UPROPERTY(EditAnywhere) float TextAnimationSpeed = 0.05f; @@ -75,7 +101,19 @@ public: void EndDialogue(); UFUNCTION(BlueprintPure) - TArray AddDialogue(FText TextInput, TArray DialogueArrayInput); + FDialoguePath CreateRootDialoguePath(); + + UFUNCTION() + FDialoguePath CreateDialoguePath(FDialoguePath ParentDialoguePath); + + UFUNCTION(BlueprintPure) + FDialoguePath CreateDialogueChoice(FDialoguePath PreviousDialoguePath); + + UFUNCTION() + bool GotoDialoguePath(FString PathId); + + UFUNCTION(BlueprintPure) + FDialoguePath AddDialogue(FText TextInput, FDialoguePath DialoguePath); UFUNCTION(BlueprintCallable) void GetFinalDialogue(TArray DialogueArray); diff --git a/UI designs/Beastiary Symbol.png b/UI designs/Beastiary Symbol.png new file mode 100644 index 0000000..4c84bf7 --- /dev/null +++ b/UI designs/Beastiary Symbol.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc23b0352f473b00631b6e36f143dc37bbd2549b35a573bec90378ea6fdd2eb7 +size 356498 diff --git a/UI designs/Combos Symbol.png b/UI designs/Combos Symbol.png new file mode 100644 index 0000000..1767bf0 --- /dev/null +++ b/UI designs/Combos Symbol.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff5a61745fe485d2a6fa9e7d936c2fdc449bb1141d22d3b7553ce0d757c8a97c +size 135451 diff --git a/UI designs/Gear Symbol.png b/UI designs/Gear Symbol.png new file mode 100644 index 0000000..4efa97b --- /dev/null +++ b/UI designs/Gear Symbol.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cab8e0b298924e605ec529f6d1a8d2adaff2ce4133915195811b05c60567de3 +size 61280 diff --git a/UI designs/Inventory Symbol.png b/UI designs/Inventory Symbol.png new file mode 100644 index 0000000..35178e0 --- /dev/null +++ b/UI designs/Inventory Symbol.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40469e465932aafa5fd3144147a4d3b193de9be693ccf69e202ff9528934350e +size 82967 diff --git a/UI designs/Map Symbol.png b/UI designs/Map Symbol.png new file mode 100644 index 0000000..7d2fe0e --- /dev/null +++ b/UI designs/Map Symbol.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1986875d9ddedd2901eb2cb8b6bf29864870bc15ad1565f36242037c565e2523 +size 98174 diff --git a/UI designs/Settings Symbol.png b/UI designs/Settings Symbol.png new file mode 100644 index 0000000..8a439ec --- /dev/null +++ b/UI designs/Settings Symbol.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ccb369c6bf70d973aa03f2294f94b70ad2e08afc0454aa4afaf7e5e2384f77f +size 101013 diff --git a/UI designs/UI book design, map and bookmark.pur b/UI designs/UI book design, map and bookmark.pur new file mode 100644 index 0000000..fb69020 Binary files /dev/null and b/UI designs/UI book design, map and bookmark.pur differ diff --git a/UI designs/book designs.psd b/UI designs/book designs.psd new file mode 100644 index 0000000..13b82d4 --- /dev/null +++ b/UI designs/book designs.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e66ac771d7f7335d346e6ecd4b6f5e9a83d78012189a9bcd2c9bebc4fafd3b7 +size 3206520 diff --git a/UI designs/final designs of book.psd b/UI designs/final designs of book.psd new file mode 100644 index 0000000..773d62a --- /dev/null +++ b/UI designs/final designs of book.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8cc262e862a2d695aaa509b7e768e4a36ea1dfd6850e68e9abcb864bd6ff32d +size 3064995 diff --git a/UI designs/game symbols designs.psd b/UI designs/game symbols designs.psd new file mode 100644 index 0000000..9618726 --- /dev/null +++ b/UI designs/game symbols designs.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d2f7796e2472e71342fdf5346d74016f820e84e9cedfa046438884586981175 +size 969178 diff --git a/UI designs/gun elements outline.psd b/UI designs/gun elements outline.psd new file mode 100644 index 0000000..9cfee0a --- /dev/null +++ b/UI designs/gun elements outline.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f238f05aa15182121d9cd8e9bcefc50974bd90b031ad880f2995a669277ac5e +size 1442079 diff --git a/UI designs/new book designs.psd b/UI designs/new book designs.psd new file mode 100644 index 0000000..599feb7 --- /dev/null +++ b/UI designs/new book designs.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22c06c817ecda9028a6e4410867cba396822ddc2ce3e20dcd51e72b535f1695e +size 3871459 diff --git a/UI designs/sketchy symbols.psd b/UI designs/sketchy symbols.psd new file mode 100644 index 0000000..83fedc4 --- /dev/null +++ b/UI designs/sketchy symbols.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d158b24535f3e0155efaf9189a059a987a5fde48ba6b4c3671697a65399ee5f +size 422048 diff --git a/UI designs/symbol for on the book.psd b/UI designs/symbol for on the book.psd new file mode 100644 index 0000000..3e4a629 --- /dev/null +++ b/UI designs/symbol for on the book.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c72b985a29734b9dc10839ded4debb90875a18189049fdf9cc481d87550f8c8e +size 839420 diff --git a/UI designs/symbols edited.psd b/UI designs/symbols edited.psd new file mode 100644 index 0000000..564b601 --- /dev/null +++ b/UI designs/symbols edited.psd @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83cc974e2b72e040031691cb974b0f3c1149cdab3ba1c28744caf3d035872b3c +size 1852242 diff --git a/UpgradeLog.htm b/UpgradeLog.htm new file mode 100644 index 0000000..67f7ecf --- /dev/null +++ b/UpgradeLog.htm @@ -0,0 +1,277 @@ + + + + Migration Report +

+ Migration Report -

Overview

ProjectPathErrorsWarningsMessages
the_twilight_abyssIntermediate\ProjectFiles\the_twilight_abyss.vcxproj100
UE5Intermediate\ProjectFiles\UE5.vcxproj100
EngineEngine000
GamesGames000
VisualizersVisualizers000
Solutionthe_twilight_abyss.sln001

Solution and projects

\ No newline at end of file diff --git a/readme.md b/readme.md index da7878c..a31cf1b 100644 --- a/readme.md +++ b/readme.md @@ -5,3 +5,7 @@ ### Character Dialogue https://docs.google.com/spreadsheets/d/13iVCQuveBiaihpREnY145OZi5QT-1sseNoI0A5v8D1o/edit?usp=sharing + +### Bestiary lore book + +https://docs.google.com/document/d/1jvDYRwQlCNFKgY6uCOwbyIQsDW3oOkqERXwN_QHcjD8/edit?usp=sharing