summaryrefslogtreecommitdiff
path: root/src/client/assets
diff options
context:
space:
mode:
authortohara <32989986+tokaritami@users.noreply.github.com>2020-05-16 23:50:25 +0900
committerGitHub <noreply@github.com>2020-05-16 23:50:25 +0900
commitd979fb6dc015029c81dc562fbb911fc6bf797c56 (patch)
tree626d2f5afbba72eeced6c9703867b9c294da6780 /src/client/assets
parentfix(client): Use router-link instead of a to avoid page refresh (diff)
downloadsharkey-d979fb6dc015029c81dc562fbb911fc6bf797c56.tar.gz
sharkey-d979fb6dc015029c81dc562fbb911fc6bf797c56.tar.bz2
sharkey-d979fb6dc015029c81dc562fbb911fc6bf797c56.zip
Add Ai3Dstatic model for Room. (#6350)
* Add Ai3Dstatic model for Room. * Update src/client/scripts/room/furnitures.json5 Co-authored-by: rinsuki <428rinsuki+git@gmail.com> * Update src/client/scripts/room/furnitures.json5 Co-authored-by: rinsuki <428rinsuki+git@gmail.com> * doll-Aiの大文字を小文字へ変更 * Update furnitures.json5 * マテリアルをBackgroundからPrincipled BSDFに変更 * a * なんかファイルが二重にでてくるので削除 * テクスチャーファイルと3Dデータを再コミット * Remove noodle * Update doll-ai.glb Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
Diffstat (limited to 'src/client/assets')
-rw-r--r--src/client/assets/room/furnitures/doll-ai/doll-ai.blendbin0 -> 1155028 bytes
-rw-r--r--src/client/assets/room/furnitures/doll-ai/doll-ai.glbbin0 -> 112160 bytes
-rw-r--r--src/client/assets/room/furnitures/doll-ai/doll_ai_tex.pngbin0 -> 10712 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend
new file mode 100644
index 0000000000..a912231ecb
--- /dev/null
+++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend
Binary files differ
diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb
new file mode 100644
index 0000000000..ec55a7bd7b
--- /dev/null
+++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb
Binary files differ
diff --git a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png
new file mode 100644
index 0000000000..370ca5f75b
--- /dev/null
+++ b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png
Binary files differ