usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2020-05-16 23:51:32 +09:00
parent 6cee608c91 d979fb6dc0
commit c1b95838f6
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/client/assets/room/furnitures/doll-ai/doll-ai.blend Normal file
View File

Binary file not shown.

BIN
src/client/assets/room/furnitures/doll-ai/doll-ai.glb Normal file
View File

Binary file not shown.

BIN
src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

4
src/client/scripts/room/furnitures.json5
View File

@ -395,5 +395,9 @@
{ {
id: 'energy-drink', id: 'energy-drink',
place: "floor", place: "floor",
},
{
id: 'doll-ai',
place: "floor",
} }
] ]