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

2024-11-22 12:13:48 +01:00 · 2020-05-16 23:51:32 +09:00 · 2020-05-16 23:51:32 +09:00 · 8756b6ca60
commit 8756b6ca60
parent cca37d35e3 423e65123b
4 changed files with 13 additions and 0 deletions
--- a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend
+++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend
--- a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb
+++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4066cc164c9cb6d3b4aefb4a59e628cf3fb468f13263838f9b02b80af3fd6035
+size 112160
--- a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png
+++ b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png
--- a/src/client/scripts/room/furnitures.json5
+++ b/src/client/scripts/room/furnitures.json5
@ -395,5 +395,9 @@
 	{
 		id: 'energy-drink',
 		place: "floor",
+	},
+	{
+		id: 'doll-ai',
+		place: "floor",
 	}
 ]