Merge branch 'develop'

2024-11-18 07:57:38 -07:00 · 2021-03-07 14:43:00 +09:00 · 2021-03-07 14:43:00 +09:00 · 22b7ad1c85
commit 22b7ad1c85
parent 54d6c7c1b1 596530fb8a
204 changed files with 211 additions and 162 deletions
--- a/src/client/assets/about-icon.png
+++ b/src/client/assets/about-icon.png
--- a/src/client/assets/fedi.jpg
+++ b/src/client/assets/fedi.jpg
--- a/src/client/assets/label-red.svg
+++ b/src/client/assets/label-red.svg
--- a/src/client/assets/label.svg
+++ b/src/client/assets/label.svg
--- a/src/client/assets/manifest.json
+++ b/src/client/assets/manifest.json
--- a/src/client/assets/misskey.svg
+++ b/src/client/assets/misskey.svg
--- a/src/client/assets/remove.png
+++ b/src/client/assets/remove.png
--- a/assets/client/room/furnitures/banknote/banknote.blend
+++ b/assets/client/room/furnitures/banknote/banknote.blend
--- a/assets/client/room/furnitures/banknote/banknote.glb
+++ b/assets/client/room/furnitures/banknote/banknote.glb
--- a/assets/client/room/furnitures/banknote/tex.png
+++ b/assets/client/room/furnitures/banknote/tex.png
--- a/assets/client/room/furnitures/bed/bed.blend
+++ b/assets/client/room/furnitures/bed/bed.blend
--- a/assets/client/room/furnitures/bed/bed.glb
+++ b/assets/client/room/furnitures/bed/bed.glb
--- a/assets/client/room/furnitures/bin/bin.blend
+++ b/assets/client/room/furnitures/bin/bin.blend
--- a/assets/client/room/furnitures/bin/bin.glb
+++ b/assets/client/room/furnitures/bin/bin.glb
--- a/assets/client/room/furnitures/book/book.blend
+++ b/assets/client/room/furnitures/book/book.blend
--- a/assets/client/room/furnitures/book/book.glb
+++ b/assets/client/room/furnitures/book/book.glb
--- a/assets/client/room/furnitures/book2/barcode.png
+++ b/assets/client/room/furnitures/book2/barcode.png
--- a/assets/client/room/furnitures/book2/book2.blend
+++ b/assets/client/room/furnitures/book2/book2.blend
--- a/assets/client/room/furnitures/book2/book2.glb
+++ b/assets/client/room/furnitures/book2/book2.glb
--- a/assets/client/room/furnitures/book2/texture.afdesign
+++ b/assets/client/room/furnitures/book2/texture.afdesign
--- a/assets/client/room/furnitures/book2/texture.png
+++ b/assets/client/room/furnitures/book2/texture.png
--- a/assets/client/room/furnitures/book2/uv.png
+++ b/assets/client/room/furnitures/book2/uv.png
--- a/assets/client/room/furnitures/cardboard-box/cardboard-box.blend
+++ b/assets/client/room/furnitures/cardboard-box/cardboard-box.blend
--- a/assets/client/room/furnitures/cardboard-box/cardboard-box.glb
+++ b/assets/client/room/furnitures/cardboard-box/cardboard-box.glb
--- a/assets/client/room/furnitures/cardboard-box2/cardboard-box2.blend
+++ b/assets/client/room/furnitures/cardboard-box2/cardboard-box2.blend
--- a/assets/client/room/furnitures/cardboard-box2/cardboard-box2.glb
+++ b/assets/client/room/furnitures/cardboard-box2/cardboard-box2.glb
--- a/assets/client/room/furnitures/cardboard-box2/texture.png
+++ b/assets/client/room/furnitures/cardboard-box2/texture.png
--- a/assets/client/room/furnitures/cardboard-box2/uv.png
+++ b/assets/client/room/furnitures/cardboard-box2/uv.png
--- a/assets/client/room/furnitures/cardboard-box3/cardboard-box3.blend
+++ b/assets/client/room/furnitures/cardboard-box3/cardboard-box3.blend
--- a/assets/client/room/furnitures/cardboard-box3/cardboard-box3.glb
+++ b/assets/client/room/furnitures/cardboard-box3/cardboard-box3.glb
--- a/assets/client/room/furnitures/cardboard-box3/texture.png
+++ b/assets/client/room/furnitures/cardboard-box3/texture.png
--- a/assets/client/room/furnitures/cardboard-box3/texture.xcf
+++ b/assets/client/room/furnitures/cardboard-box3/texture.xcf
--- a/assets/client/room/furnitures/cardboard-box3/uv.png
+++ b/assets/client/room/furnitures/cardboard-box3/uv.png
--- a/assets/client/room/furnitures/carpet-stripe/carpet-stripe.blend
+++ b/assets/client/room/furnitures/carpet-stripe/carpet-stripe.blend
--- a/assets/client/room/furnitures/carpet-stripe/carpet-stripe.glb
+++ b/assets/client/room/furnitures/carpet-stripe/carpet-stripe.glb
--- a/assets/client/room/furnitures/chair/chair.blend
+++ b/assets/client/room/furnitures/chair/chair.blend
--- a/assets/client/room/furnitures/chair/chair.glb
+++ b/assets/client/room/furnitures/chair/chair.glb
--- a/assets/client/room/furnitures/chair2/chair2.blend
+++ b/assets/client/room/furnitures/chair2/chair2.blend
--- a/assets/client/room/furnitures/chair2/chair2.glb
+++ b/assets/client/room/furnitures/chair2/chair2.glb
--- a/assets/client/room/furnitures/color-box/color-box.blend
+++ b/assets/client/room/furnitures/color-box/color-box.blend
--- a/assets/client/room/furnitures/color-box/color-box.glb
+++ b/assets/client/room/furnitures/color-box/color-box.glb
--- a/assets/client/room/furnitures/corkboard/corkboard.blend
+++ b/assets/client/room/furnitures/corkboard/corkboard.blend
--- a/assets/client/room/furnitures/corkboard/corkboard.glb
+++ b/assets/client/room/furnitures/corkboard/corkboard.glb
--- a/assets/client/room/furnitures/cube/cube.blend
+++ b/assets/client/room/furnitures/cube/cube.blend
--- a/assets/client/room/furnitures/cube/cube.glb
+++ b/assets/client/room/furnitures/cube/cube.glb
--- a/assets/client/room/furnitures/cup-noodle/cup-noodle.blend
+++ b/assets/client/room/furnitures/cup-noodle/cup-noodle.blend
--- a/assets/client/room/furnitures/cup-noodle/cup-noodle.glb
+++ b/assets/client/room/furnitures/cup-noodle/cup-noodle.glb
--- a/assets/client/room/furnitures/cup-noodle/noodle.png
+++ b/assets/client/room/furnitures/cup-noodle/noodle.png
--- a/assets/client/room/furnitures/desk/desk.blend
+++ b/assets/client/room/furnitures/desk/desk.blend
--- a/assets/client/room/furnitures/desk/desk.glb
+++ b/assets/client/room/furnitures/desk/desk.glb
--- a/assets/client/room/furnitures/doll-ai/doll-ai.blend
+++ b/assets/client/room/furnitures/doll-ai/doll-ai.blend
--- a/assets/client/room/furnitures/doll-ai/doll-ai.glb
+++ b/assets/client/room/furnitures/doll-ai/doll-ai.glb
--- a/assets/client/room/furnitures/doll-ai/doll_ai_tex.png
+++ b/assets/client/room/furnitures/doll-ai/doll_ai_tex.png
--- a/assets/client/room/furnitures/energy-drink/energy-drink.blend
+++ b/assets/client/room/furnitures/energy-drink/energy-drink.blend
--- a/assets/client/room/furnitures/energy-drink/energy-drink.glb
+++ b/assets/client/room/furnitures/energy-drink/energy-drink.glb
--- a/assets/client/room/furnitures/energy-drink/texture.afdesign
+++ b/assets/client/room/furnitures/energy-drink/texture.afdesign
--- a/assets/client/room/furnitures/energy-drink/texture.png
+++ b/assets/client/room/furnitures/energy-drink/texture.png
--- a/assets/client/room/furnitures/energy-drink/uv.png
+++ b/assets/client/room/furnitures/energy-drink/uv.png
--- a/assets/client/room/furnitures/eraser/cover.png
+++ b/assets/client/room/furnitures/eraser/cover.png
--- a/assets/client/room/furnitures/eraser/cover.psd
+++ b/assets/client/room/furnitures/eraser/cover.psd
--- a/assets/client/room/furnitures/eraser/eraser-uv.png
+++ b/assets/client/room/furnitures/eraser/eraser-uv.png
--- a/assets/client/room/furnitures/eraser/eraser.blend
+++ b/assets/client/room/furnitures/eraser/eraser.blend
--- a/assets/client/room/furnitures/eraser/eraser.glb
+++ b/assets/client/room/furnitures/eraser/eraser.glb
--- a/assets/client/room/furnitures/facial-tissue/facial-tissue-uv.png
+++ b/assets/client/room/furnitures/facial-tissue/facial-tissue-uv.png
--- a/assets/client/room/furnitures/facial-tissue/facial-tissue.blend
+++ b/assets/client/room/furnitures/facial-tissue/facial-tissue.blend
--- a/assets/client/room/furnitures/facial-tissue/facial-tissue.glb
+++ b/assets/client/room/furnitures/facial-tissue/facial-tissue.glb
--- a/assets/client/room/furnitures/facial-tissue/facial-tissue.png
+++ b/assets/client/room/furnitures/facial-tissue/facial-tissue.png
--- a/assets/client/room/furnitures/facial-tissue/facial-tissue.psd
+++ b/assets/client/room/furnitures/facial-tissue/facial-tissue.psd
--- a/assets/client/room/furnitures/fan/fan.blend
+++ b/assets/client/room/furnitures/fan/fan.blend
--- a/assets/client/room/furnitures/fan/fan.glb
+++ b/assets/client/room/furnitures/fan/fan.glb
--- a/assets/client/room/furnitures/holo-display/holo-display.blend
+++ b/assets/client/room/furnitures/holo-display/holo-display.blend
--- a/assets/client/room/furnitures/holo-display/holo-display.glb
+++ b/assets/client/room/furnitures/holo-display/holo-display.glb
--- a/assets/client/room/furnitures/holo-display/ray-uv.png
+++ b/assets/client/room/furnitures/holo-display/ray-uv.png
--- a/assets/client/room/furnitures/holo-display/ray.png
+++ b/assets/client/room/furnitures/holo-display/ray.png
--- a/assets/client/room/furnitures/keyboard/keyboard.blend
+++ b/assets/client/room/furnitures/keyboard/keyboard.blend
--- a/assets/client/room/furnitures/keyboard/keyboard.glb
+++ b/assets/client/room/furnitures/keyboard/keyboard.glb
--- a/assets/client/room/furnitures/low-table/low-table.blend
+++ b/assets/client/room/furnitures/low-table/low-table.blend
--- a/assets/client/room/furnitures/low-table/low-table.glb
+++ b/assets/client/room/furnitures/low-table/low-table.glb
--- a/assets/client/room/furnitures/mat/mat.blend
+++ b/assets/client/room/furnitures/mat/mat.blend
--- a/assets/client/room/furnitures/mat/mat.glb
+++ b/assets/client/room/furnitures/mat/mat.glb
--- a/assets/client/room/furnitures/milk/milk-uv.png
+++ b/assets/client/room/furnitures/milk/milk-uv.png
--- a/assets/client/room/furnitures/milk/milk.blend
+++ b/assets/client/room/furnitures/milk/milk.blend
--- a/assets/client/room/furnitures/milk/milk.glb
+++ b/assets/client/room/furnitures/milk/milk.glb
--- a/assets/client/room/furnitures/milk/milk.png
+++ b/assets/client/room/furnitures/milk/milk.png
--- a/assets/client/room/furnitures/milk/milk.psd
+++ b/assets/client/room/furnitures/milk/milk.psd
--- a/assets/client/room/furnitures/monitor/monitor.blend
+++ b/assets/client/room/furnitures/monitor/monitor.blend
--- a/assets/client/room/furnitures/monitor/monitor.glb
+++ b/assets/client/room/furnitures/monitor/monitor.glb
--- a/assets/client/room/furnitures/monitor/monitor.psd
+++ b/assets/client/room/furnitures/monitor/monitor.psd
--- a/assets/client/room/furnitures/monitor/screen-uv.png
+++ b/assets/client/room/furnitures/monitor/screen-uv.png
--- a/assets/client/room/furnitures/monitor/screen.jpg
+++ b/assets/client/room/furnitures/monitor/screen.jpg
--- a/assets/client/room/furnitures/moon/moon.blend
+++ b/assets/client/room/furnitures/moon/moon.blend
--- a/assets/client/room/furnitures/moon/moon.glb
+++ b/assets/client/room/furnitures/moon/moon.glb
--- a/assets/client/room/furnitures/moon/moon.jpg
+++ b/assets/client/room/furnitures/moon/moon.jpg
--- a/assets/client/room/furnitures/mousepad/mousepad.blend
+++ b/assets/client/room/furnitures/mousepad/mousepad.blend
--- a/assets/client/room/furnitures/mousepad/mousepad.glb
+++ b/assets/client/room/furnitures/mousepad/mousepad.glb
--- a/assets/client/room/furnitures/pc/motherboard-uv.png
+++ b/assets/client/room/furnitures/pc/motherboard-uv.png
--- a/assets/client/room/furnitures/pc/motherboard-uv.psd
+++ b/assets/client/room/furnitures/pc/motherboard-uv.psd
--- a/assets/client/room/furnitures/pc/motherboard.jpg
+++ b/assets/client/room/furnitures/pc/motherboard.jpg
--- a/assets/client/room/furnitures/pc/pc.blend
+++ b/assets/client/room/furnitures/pc/pc.blend
--- a/assets/client/room/furnitures/pc/pc.glb
+++ b/assets/client/room/furnitures/pc/pc.glb
--- a/Show more
+++ b/Show more