graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-09 19:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
syuilo 2020-05-16 23:51:32 +09:00
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',
place: "floor",
},
{
id: 'doll-ai',
place: "floor",
}
]