diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-05-16 23:51:32 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-05-16 23:51:32 +0900 |
| commit | c1b95838f6cb20d2d91deb773044aa0ede1df86c (patch) | |
| tree | 9e8da3019bac77462e2f48a3db64a1d2825ed5e4 | |
| parent | chore(locale): Add doll-ai translation (diff) | |
| parent | Add Ai3Dstatic model for Room. (#6350) (diff) | |
| download | sharkey-c1b95838f6cb20d2d91deb773044aa0ede1df86c.tar.gz sharkey-c1b95838f6cb20d2d91deb773044aa0ede1df86c.tar.bz2 sharkey-c1b95838f6cb20d2d91deb773044aa0ede1df86c.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
| -rw-r--r-- | src/client/assets/room/furnitures/doll-ai/doll-ai.blend | bin | 0 -> 1155028 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/doll-ai/doll-ai.glb | bin | 0 -> 112160 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png | bin | 0 -> 10712 bytes | |||
| -rw-r--r-- | src/client/scripts/room/furnitures.json5 | 4 |
4 files changed, 4 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 Binary files differnew file mode 100644 index 0000000000..a912231ecb --- /dev/null +++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb Binary files differnew file mode 100644 index 0000000000..ec55a7bd7b --- /dev/null +++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb 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 Binary files differnew file mode 100644 index 0000000000..370ca5f75b --- /dev/null +++ b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png diff --git a/src/client/scripts/room/furnitures.json5 b/src/client/scripts/room/furnitures.json5 index c731e85a9f..ae99c8bb83 100644 --- 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", } ] |
