summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorOni-Men <sensyaheis@gmail.com>2019-08-20 15:57:42 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-08-20 15:57:42 +0900
commit630d873ec0a8ff918ef815e53b267ca8209d8996 (patch)
tree199b48a095fba9b0c0cb93b1791cd732c83610a3 /src/client
parentNew Crowdin translations (#5321) (diff)
downloadsharkey-630d873ec0a8ff918ef815e53b267ca8209d8996.tar.gz
sharkey-630d873ec0a8ff918ef815e53b267ca8209d8996.tar.bz2
sharkey-630d873ec0a8ff918ef815e53b267ca8209d8996.zip
[room]Add cup noodle (#5323)
* [Room] Add cup noodles * remove , * Fix Cup-Noodle Texture
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/scripts/room/furnitures.json54
-rw-r--r--src/client/assets/room/furnitures/cup-noodle/cup-noodle.blendbin0 -> 1215024 bytes
-rw-r--r--src/client/assets/room/furnitures/cup-noodle/cup-noodle.glbbin0 -> 341136 bytes
-rw-r--r--src/client/assets/room/furnitures/cup-noodle/noodle.pngbin0 -> 297154 bytes
4 files changed, 4 insertions, 0 deletions
diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5
index fec1791657..5893147dcc 100644
--- a/src/client/app/common/scripts/room/furnitures.json5
+++ b/src/client/app/common/scripts/room/furnitures.json5
@@ -351,4 +351,8 @@
Bin: 'color'
}
},
+ {
+ id: "cup-noodle",
+ place: "floor"
+ }
]
diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend
new file mode 100644
index 0000000000..ca7b832d18
--- /dev/null
+++ b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend
Binary files differ
diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb
new file mode 100644
index 0000000000..cb8622af51
--- /dev/null
+++ b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb
Binary files differ
diff --git a/src/client/assets/room/furnitures/cup-noodle/noodle.png b/src/client/assets/room/furnitures/cup-noodle/noodle.png
new file mode 100644
index 0000000000..1d74e0bbe7
--- /dev/null
+++ b/src/client/assets/room/furnitures/cup-noodle/noodle.png
Binary files differ