summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-08-24 02:18:21 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-08-24 02:18:21 +0900
commitf4cec53ba1990fae856f61fbc98c4bbaceca0181 (patch)
tree3847279f117c077e21a236d97e1ba6746bdf414e
parent[Room] Add energy drink (diff)
downloadsharkey-f4cec53ba1990fae856f61fbc98c4bbaceca0181.tar.gz
sharkey-f4cec53ba1990fae856f61fbc98c4bbaceca0181.tar.bz2
sharkey-f4cec53ba1990fae856f61fbc98c4bbaceca0181.zip
[Room] Make Pinguin customizable
-rw-r--r--src/client/app/common/scripts/room/furnitures.json510
-rw-r--r--src/client/assets/room/furnitures/pinguin/pinguin.blendbin0 -> 778976 bytes
-rw-r--r--src/client/assets/room/furnitures/pinguin/pinguin.glbbin60192 -> 60172 bytes
3 files changed, 9 insertions, 1 deletions
diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5
index b469ff5a82..7c1a90a3f9 100644
--- a/src/client/app/common/scripts/room/furnitures.json5
+++ b/src/client/app/common/scripts/room/furnitures.json5
@@ -279,7 +279,15 @@
},
{
id: "pinguin",
- place: "floor"
+ place: "floor",
+ props: {
+ body: 'color',
+ belly: 'color'
+ },
+ color: {
+ Body: 'body',
+ Belly: 'belly',
+ }
},
{
id: "rubik-cube",
diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.blend b/src/client/assets/room/furnitures/pinguin/pinguin.blend
new file mode 100644
index 0000000000..514c713e4c
--- /dev/null
+++ b/src/client/assets/room/furnitures/pinguin/pinguin.blend
Binary files differ
diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.glb b/src/client/assets/room/furnitures/pinguin/pinguin.glb
index 0ddf611ad9..6df34c06e9 100644
--- a/src/client/assets/room/furnitures/pinguin/pinguin.glb
+++ b/src/client/assets/room/furnitures/pinguin/pinguin.glb
Binary files differ