From f4134c478f35b8c161dc59180d5420924dc057fb Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 30 Jan 2023 22:37:15 +0000 Subject: [PATCH 1/2] Added Blue Jelly asset I added a blue jelly asset to be used in the merchant system --- Content/Assets/Objects/Blue_Jelly/BlueJelly_Cylinder.uasset | 3 +++ Content/Assets/Objects/Blue_Jelly/BlueJelly_Mball_009.uasset | 3 +++ Content/Assets/Objects/Blue_Jelly/Material_001.uasset | 3 +++ Content/Assets/Objects/Blue_Jelly/Material_002.uasset | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 Content/Assets/Objects/Blue_Jelly/BlueJelly_Cylinder.uasset create mode 100644 Content/Assets/Objects/Blue_Jelly/BlueJelly_Mball_009.uasset create mode 100644 Content/Assets/Objects/Blue_Jelly/Material_001.uasset create mode 100644 Content/Assets/Objects/Blue_Jelly/Material_002.uasset diff --git a/Content/Assets/Objects/Blue_Jelly/BlueJelly_Cylinder.uasset b/Content/Assets/Objects/Blue_Jelly/BlueJelly_Cylinder.uasset new file mode 100644 index 0000000..8aec2fd --- /dev/null +++ b/Content/Assets/Objects/Blue_Jelly/BlueJelly_Cylinder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca8b57cfbdcd8348470e39d8c28aa3f2cb3e0da6e81be5750c7e8bced379045c +size 39551 diff --git a/Content/Assets/Objects/Blue_Jelly/BlueJelly_Mball_009.uasset b/Content/Assets/Objects/Blue_Jelly/BlueJelly_Mball_009.uasset new file mode 100644 index 0000000..8d6a890 --- /dev/null +++ b/Content/Assets/Objects/Blue_Jelly/BlueJelly_Mball_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b34cad3ae6933b9958c0366df60f26ed8861b6c7faf8926f77eb9d77c57a14e3 +size 102108 diff --git a/Content/Assets/Objects/Blue_Jelly/Material_001.uasset b/Content/Assets/Objects/Blue_Jelly/Material_001.uasset new file mode 100644 index 0000000..a6f03fa --- /dev/null +++ b/Content/Assets/Objects/Blue_Jelly/Material_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cfaa4f57bf66b81bb79bc771e9dc4a12e839f7013713c576f2cc0f0d6fec17b +size 7982 diff --git a/Content/Assets/Objects/Blue_Jelly/Material_002.uasset b/Content/Assets/Objects/Blue_Jelly/Material_002.uasset new file mode 100644 index 0000000..b63b60b --- /dev/null +++ b/Content/Assets/Objects/Blue_Jelly/Material_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4a7c513681ca7acfa66d54e22e631b06471bacf059d31e2b0c4df2f2ee1c87a +size 7553 From beb110a90153cf3b2b8c8071ff661a528b0fd95a Mon Sep 17 00:00:00 2001 From: KACPER Szelest Date: Mon, 30 Jan 2023 22:39:29 +0000 Subject: [PATCH 2/2] Added Red Jelly Asset I added a red Jelly asset to be used in the merchant system as a placeholder asset --- Content/Assets/Objects/Red_Jelly/Material_001.uasset | 3 +++ Content/Assets/Objects/Red_Jelly/Material_002.uasset | 3 +++ Content/Assets/Objects/Red_Jelly/Redjelly_Cylinder.uasset | 3 +++ Content/Assets/Objects/Red_Jelly/Redjelly_Mball_009.uasset | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 Content/Assets/Objects/Red_Jelly/Material_001.uasset create mode 100644 Content/Assets/Objects/Red_Jelly/Material_002.uasset create mode 100644 Content/Assets/Objects/Red_Jelly/Redjelly_Cylinder.uasset create mode 100644 Content/Assets/Objects/Red_Jelly/Redjelly_Mball_009.uasset diff --git a/Content/Assets/Objects/Red_Jelly/Material_001.uasset b/Content/Assets/Objects/Red_Jelly/Material_001.uasset new file mode 100644 index 0000000..19cf8df --- /dev/null +++ b/Content/Assets/Objects/Red_Jelly/Material_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed9efc59130655d42cf557ef3026512a72c7582dfd28e4088cb8e899e6ca8572 +size 7326 diff --git a/Content/Assets/Objects/Red_Jelly/Material_002.uasset b/Content/Assets/Objects/Red_Jelly/Material_002.uasset new file mode 100644 index 0000000..374de08 --- /dev/null +++ b/Content/Assets/Objects/Red_Jelly/Material_002.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b712614cebd3c1cc786fd40866cf4c47657e7cd3e7e74fb154c9e83032fb6ab +size 7580 diff --git a/Content/Assets/Objects/Red_Jelly/Redjelly_Cylinder.uasset b/Content/Assets/Objects/Red_Jelly/Redjelly_Cylinder.uasset new file mode 100644 index 0000000..78e71c9 --- /dev/null +++ b/Content/Assets/Objects/Red_Jelly/Redjelly_Cylinder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aeaf5f844d2499c0f9376361f8205bb1851deec49e37bbbe9fde8827a2a14321 +size 39558 diff --git a/Content/Assets/Objects/Red_Jelly/Redjelly_Mball_009.uasset b/Content/Assets/Objects/Red_Jelly/Redjelly_Mball_009.uasset new file mode 100644 index 0000000..203fb89 --- /dev/null +++ b/Content/Assets/Objects/Red_Jelly/Redjelly_Mball_009.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cbd3275bdc85e115cd900d3d96dde3ef29b41ef8030dccb0fae2f18c531a933 +size 102016