diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-03-06 23:23:54 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-03-06 23:23:54 +0900 |
| commit | f7e9725e59dd241b11fda729cc5c96a64d7e2545 (patch) | |
| tree | ca09dd961685d789efa53dad8b6eba240b643eac /src/client | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.74.0 (diff) | |
| download | misskey-f7e9725e59dd241b11fda729cc5c96a64d7e2545.tar.gz misskey-f7e9725e59dd241b11fda729cc5c96a64d7e2545.tar.bz2 misskey-f7e9725e59dd241b11fda729cc5c96a64d7e2545.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client')
187 files changed, 171 insertions, 104 deletions
diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json index f5a1d47a8a..48030a2980 100644 --- a/src/client/assets/manifest.json +++ b/src/client/assets/manifest.json @@ -7,12 +7,12 @@ "theme_color": "#86b300", "icons": [ { - "src": "/assets/icons/192.png", + "src": "/static-assets/icons/192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/assets/icons/512.png", + "src": "/static-assets/icons/512.png", "sizes": "512x512", "type": "image/png" } diff --git a/src/client/assets/room/furnitures/banknote/banknote.blend b/src/client/assets/room/furnitures/banknote/banknote.blend Binary files differdeleted file mode 100644 index 60b1968a29..0000000000 --- a/src/client/assets/room/furnitures/banknote/banknote.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/banknote/banknote.glb b/src/client/assets/room/furnitures/banknote/banknote.glb Binary files differdeleted file mode 100644 index f4ef0b91e7..0000000000 --- a/src/client/assets/room/furnitures/banknote/banknote.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/banknote/tex.png b/src/client/assets/room/furnitures/banknote/tex.png Binary files differdeleted file mode 100644 index 9106dc1457..0000000000 --- a/src/client/assets/room/furnitures/banknote/tex.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/bed/bed.blend b/src/client/assets/room/furnitures/bed/bed.blend Binary files differdeleted file mode 100644 index 731df76d0c..0000000000 --- a/src/client/assets/room/furnitures/bed/bed.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/bed/bed.glb b/src/client/assets/room/furnitures/bed/bed.glb Binary files differdeleted file mode 100644 index f35ecb9ef4..0000000000 --- a/src/client/assets/room/furnitures/bed/bed.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/bin/bin.blend b/src/client/assets/room/furnitures/bin/bin.blend Binary files differdeleted file mode 100644 index 8d459a0869..0000000000 --- a/src/client/assets/room/furnitures/bin/bin.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/bin/bin.glb b/src/client/assets/room/furnitures/bin/bin.glb Binary files differdeleted file mode 100644 index b45f203802..0000000000 --- a/src/client/assets/room/furnitures/bin/bin.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/book/book.blend b/src/client/assets/room/furnitures/book/book.blend Binary files differdeleted file mode 100644 index 0d4899d4ae..0000000000 --- a/src/client/assets/room/furnitures/book/book.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/book/book.glb b/src/client/assets/room/furnitures/book/book.glb Binary files differdeleted file mode 100644 index 546893da06..0000000000 --- a/src/client/assets/room/furnitures/book/book.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/book2/barcode.png b/src/client/assets/room/furnitures/book2/barcode.png Binary files differdeleted file mode 100644 index 37cfe5add3..0000000000 --- a/src/client/assets/room/furnitures/book2/barcode.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/book2/book2.blend b/src/client/assets/room/furnitures/book2/book2.blend Binary files differdeleted file mode 100644 index e0fdb48101..0000000000 --- a/src/client/assets/room/furnitures/book2/book2.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/book2/book2.glb b/src/client/assets/room/furnitures/book2/book2.glb Binary files differdeleted file mode 100644 index 2b26402f8c..0000000000 --- a/src/client/assets/room/furnitures/book2/book2.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/book2/texture.afdesign b/src/client/assets/room/furnitures/book2/texture.afdesign Binary files differdeleted file mode 100644 index b63771607a..0000000000 --- a/src/client/assets/room/furnitures/book2/texture.afdesign +++ /dev/null diff --git a/src/client/assets/room/furnitures/book2/texture.png b/src/client/assets/room/furnitures/book2/texture.png Binary files differdeleted file mode 100644 index 5aa84f0340..0000000000 --- a/src/client/assets/room/furnitures/book2/texture.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/book2/uv.png b/src/client/assets/room/furnitures/book2/uv.png Binary files differdeleted file mode 100644 index 61c4fb0400..0000000000 --- a/src/client/assets/room/furnitures/book2/uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend Binary files differdeleted file mode 100644 index 3a528de32a..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb Binary files differdeleted file mode 100644 index bed372e94f..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend Binary files differdeleted file mode 100644 index 5f146267ac..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb Binary files differdeleted file mode 100644 index 85fcb5c0b6..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box2/texture.png b/src/client/assets/room/furnitures/cardboard-box2/texture.png Binary files differdeleted file mode 100644 index e498d8f65b..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box2/texture.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box2/uv.png b/src/client/assets/room/furnitures/cardboard-box2/uv.png Binary files differdeleted file mode 100644 index d547843ee0..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box2/uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend Binary files differdeleted file mode 100644 index 00681a3cfd..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb Binary files differdeleted file mode 100644 index 1ef0427689..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.png b/src/client/assets/room/furnitures/cardboard-box3/texture.png Binary files differdeleted file mode 100644 index 56c914cb9d..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box3/texture.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf b/src/client/assets/room/furnitures/cardboard-box3/texture.xcf Binary files differdeleted file mode 100644 index 7ffb3e3439..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf +++ /dev/null diff --git a/src/client/assets/room/furnitures/cardboard-box3/uv.png b/src/client/assets/room/furnitures/cardboard-box3/uv.png Binary files differdeleted file mode 100644 index 797ac509db..0000000000 --- a/src/client/assets/room/furnitures/cardboard-box3/uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend Binary files differdeleted file mode 100644 index 750343d4f0..0000000000 --- a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb Binary files differdeleted file mode 100644 index 3066a69e35..0000000000 --- a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/chair/chair.blend b/src/client/assets/room/furnitures/chair/chair.blend Binary files differdeleted file mode 100644 index 79c29a8401..0000000000 --- a/src/client/assets/room/furnitures/chair/chair.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/chair/chair.glb b/src/client/assets/room/furnitures/chair/chair.glb Binary files differdeleted file mode 100644 index 08ee1a0bb0..0000000000 --- a/src/client/assets/room/furnitures/chair/chair.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/chair2/chair2.blend b/src/client/assets/room/furnitures/chair2/chair2.blend Binary files differdeleted file mode 100644 index c6a1acd96f..0000000000 --- a/src/client/assets/room/furnitures/chair2/chair2.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/chair2/chair2.glb b/src/client/assets/room/furnitures/chair2/chair2.glb Binary files differdeleted file mode 100644 index 5ea2f3518b..0000000000 --- a/src/client/assets/room/furnitures/chair2/chair2.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/color-box/color-box.blend b/src/client/assets/room/furnitures/color-box/color-box.blend Binary files differdeleted file mode 100644 index f96a4ff766..0000000000 --- a/src/client/assets/room/furnitures/color-box/color-box.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/color-box/color-box.glb b/src/client/assets/room/furnitures/color-box/color-box.glb Binary files differdeleted file mode 100644 index 43f2abcae8..0000000000 --- a/src/client/assets/room/furnitures/color-box/color-box.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.blend b/src/client/assets/room/furnitures/corkboard/corkboard.blend Binary files differdeleted file mode 100644 index 9a7e1878cd..0000000000 --- a/src/client/assets/room/furnitures/corkboard/corkboard.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.glb b/src/client/assets/room/furnitures/corkboard/corkboard.glb Binary files differdeleted file mode 100644 index fee108fb91..0000000000 --- a/src/client/assets/room/furnitures/corkboard/corkboard.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/cube/cube.blend b/src/client/assets/room/furnitures/cube/cube.blend Binary files differdeleted file mode 100644 index 1af5bf40a9..0000000000 --- a/src/client/assets/room/furnitures/cube/cube.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/cube/cube.glb b/src/client/assets/room/furnitures/cube/cube.glb Binary files differdeleted file mode 100644 index 4ac8b6036d..0000000000 --- a/src/client/assets/room/furnitures/cube/cube.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend Binary files differdeleted file mode 100644 index 37ca8868c7..0000000000 --- a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb Binary files differdeleted file mode 100644 index 58efb1b3b4..0000000000 --- a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/cup-noodle/noodle.png b/src/client/assets/room/furnitures/cup-noodle/noodle.png Binary files differdeleted file mode 100644 index 1d74e0bbe7..0000000000 --- a/src/client/assets/room/furnitures/cup-noodle/noodle.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/desk/desk.blend b/src/client/assets/room/furnitures/desk/desk.blend Binary files differdeleted file mode 100644 index c88d01f0b2..0000000000 --- a/src/client/assets/room/furnitures/desk/desk.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/desk/desk.glb b/src/client/assets/room/furnitures/desk/desk.glb Binary files differdeleted file mode 100644 index 4a58513095..0000000000 --- a/src/client/assets/room/furnitures/desk/desk.glb +++ /dev/null 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 differdeleted file mode 100644 index a912231ecb..0000000000 --- a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend +++ /dev/null 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 differdeleted file mode 100644 index ec55a7bd7b..0000000000 --- a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb +++ /dev/null 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 differdeleted file mode 100644 index 370ca5f75b..0000000000 --- a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend Binary files differdeleted file mode 100644 index 65fc41273e..0000000000 --- a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb Binary files differdeleted file mode 100644 index 7fb1c27836..0000000000 --- a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/energy-drink/texture.afdesign b/src/client/assets/room/furnitures/energy-drink/texture.afdesign Binary files differdeleted file mode 100644 index 8c117a49b1..0000000000 --- a/src/client/assets/room/furnitures/energy-drink/texture.afdesign +++ /dev/null diff --git a/src/client/assets/room/furnitures/energy-drink/texture.png b/src/client/assets/room/furnitures/energy-drink/texture.png Binary files differdeleted file mode 100644 index 484ca0f96f..0000000000 --- a/src/client/assets/room/furnitures/energy-drink/texture.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/energy-drink/uv.png b/src/client/assets/room/furnitures/energy-drink/uv.png Binary files differdeleted file mode 100644 index 2a3f20c999..0000000000 --- a/src/client/assets/room/furnitures/energy-drink/uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/eraser/cover.png b/src/client/assets/room/furnitures/eraser/cover.png Binary files differdeleted file mode 100644 index 932a3fc62e..0000000000 --- a/src/client/assets/room/furnitures/eraser/cover.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/eraser/cover.psd b/src/client/assets/room/furnitures/eraser/cover.psd Binary files differdeleted file mode 100644 index c393337833..0000000000 --- a/src/client/assets/room/furnitures/eraser/cover.psd +++ /dev/null diff --git a/src/client/assets/room/furnitures/eraser/eraser-uv.png b/src/client/assets/room/furnitures/eraser/eraser-uv.png Binary files differdeleted file mode 100644 index 89e4ea4c45..0000000000 --- a/src/client/assets/room/furnitures/eraser/eraser-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/eraser/eraser.blend b/src/client/assets/room/furnitures/eraser/eraser.blend Binary files differdeleted file mode 100644 index 103c54fbae..0000000000 --- a/src/client/assets/room/furnitures/eraser/eraser.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/eraser/eraser.glb b/src/client/assets/room/furnitures/eraser/eraser.glb Binary files differdeleted file mode 100644 index 016b60df20..0000000000 --- a/src/client/assets/room/furnitures/eraser/eraser.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png b/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png Binary files differdeleted file mode 100644 index e3865ad15e..0000000000 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend Binary files differdeleted file mode 100644 index d59f87c1ee..0000000000 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb Binary files differdeleted file mode 100644 index 48b36ef347..0000000000 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png Binary files differdeleted file mode 100644 index 7cee4b1859..0000000000 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd Binary files differdeleted file mode 100644 index cd59fc007b..0000000000 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd +++ /dev/null diff --git a/src/client/assets/room/furnitures/fan/fan.blend b/src/client/assets/room/furnitures/fan/fan.blend Binary files differdeleted file mode 100644 index 8c8106e5fe..0000000000 --- a/src/client/assets/room/furnitures/fan/fan.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/fan/fan.glb b/src/client/assets/room/furnitures/fan/fan.glb Binary files differdeleted file mode 100644 index d9367f3534..0000000000 --- a/src/client/assets/room/furnitures/fan/fan.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.blend b/src/client/assets/room/furnitures/holo-display/holo-display.blend Binary files differdeleted file mode 100644 index 56d2e1f819..0000000000 --- a/src/client/assets/room/furnitures/holo-display/holo-display.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.glb b/src/client/assets/room/furnitures/holo-display/holo-display.glb Binary files differdeleted file mode 100644 index 4d042a59b3..0000000000 --- a/src/client/assets/room/furnitures/holo-display/holo-display.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/holo-display/ray-uv.png b/src/client/assets/room/furnitures/holo-display/ray-uv.png Binary files differdeleted file mode 100644 index aa7e817e0f..0000000000 --- a/src/client/assets/room/furnitures/holo-display/ray-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/holo-display/ray.png b/src/client/assets/room/furnitures/holo-display/ray.png Binary files differdeleted file mode 100644 index 6a5d24e143..0000000000 --- a/src/client/assets/room/furnitures/holo-display/ray.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.blend b/src/client/assets/room/furnitures/keyboard/keyboard.blend Binary files differdeleted file mode 100644 index ab33d134b3..0000000000 --- a/src/client/assets/room/furnitures/keyboard/keyboard.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.glb b/src/client/assets/room/furnitures/keyboard/keyboard.glb Binary files differdeleted file mode 100644 index 15dc69f47a..0000000000 --- a/src/client/assets/room/furnitures/keyboard/keyboard.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/low-table/low-table.blend b/src/client/assets/room/furnitures/low-table/low-table.blend Binary files differdeleted file mode 100644 index e1592174d9..0000000000 --- a/src/client/assets/room/furnitures/low-table/low-table.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/low-table/low-table.glb b/src/client/assets/room/furnitures/low-table/low-table.glb Binary files differdeleted file mode 100644 index c69bf35d7b..0000000000 --- a/src/client/assets/room/furnitures/low-table/low-table.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/mat/mat.blend b/src/client/assets/room/furnitures/mat/mat.blend Binary files differdeleted file mode 100644 index a1e1a68c55..0000000000 --- a/src/client/assets/room/furnitures/mat/mat.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/mat/mat.glb b/src/client/assets/room/furnitures/mat/mat.glb Binary files differdeleted file mode 100644 index 87ccd44e1a..0000000000 --- a/src/client/assets/room/furnitures/mat/mat.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/milk/milk-uv.png b/src/client/assets/room/furnitures/milk/milk-uv.png Binary files differdeleted file mode 100644 index 258fd54638..0000000000 --- a/src/client/assets/room/furnitures/milk/milk-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/milk/milk.blend b/src/client/assets/room/furnitures/milk/milk.blend Binary files differdeleted file mode 100644 index 2df508d5b9..0000000000 --- a/src/client/assets/room/furnitures/milk/milk.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/milk/milk.glb b/src/client/assets/room/furnitures/milk/milk.glb Binary files differdeleted file mode 100644 index b335fe3d02..0000000000 --- a/src/client/assets/room/furnitures/milk/milk.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/milk/milk.png b/src/client/assets/room/furnitures/milk/milk.png Binary files differdeleted file mode 100644 index 35181c8c8c..0000000000 --- a/src/client/assets/room/furnitures/milk/milk.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/milk/milk.psd b/src/client/assets/room/furnitures/milk/milk.psd Binary files differdeleted file mode 100644 index f31e439277..0000000000 --- a/src/client/assets/room/furnitures/milk/milk.psd +++ /dev/null diff --git a/src/client/assets/room/furnitures/monitor/monitor.blend b/src/client/assets/room/furnitures/monitor/monitor.blend Binary files differdeleted file mode 100644 index 6c042ccdd8..0000000000 --- a/src/client/assets/room/furnitures/monitor/monitor.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/monitor/monitor.glb b/src/client/assets/room/furnitures/monitor/monitor.glb Binary files differdeleted file mode 100644 index fc33286a15..0000000000 --- a/src/client/assets/room/furnitures/monitor/monitor.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/monitor/monitor.psd b/src/client/assets/room/furnitures/monitor/monitor.psd Binary files differdeleted file mode 100644 index 57afff9cd9..0000000000 --- a/src/client/assets/room/furnitures/monitor/monitor.psd +++ /dev/null diff --git a/src/client/assets/room/furnitures/monitor/screen-uv.png b/src/client/assets/room/furnitures/monitor/screen-uv.png Binary files differdeleted file mode 100644 index 35f74de8aa..0000000000 --- a/src/client/assets/room/furnitures/monitor/screen-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/monitor/screen.jpg b/src/client/assets/room/furnitures/monitor/screen.jpg Binary files differdeleted file mode 100644 index 4004a1ede9..0000000000 --- a/src/client/assets/room/furnitures/monitor/screen.jpg +++ /dev/null diff --git a/src/client/assets/room/furnitures/moon/moon.blend b/src/client/assets/room/furnitures/moon/moon.blend Binary files differdeleted file mode 100644 index 4ff3deab8e..0000000000 --- a/src/client/assets/room/furnitures/moon/moon.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/moon/moon.glb b/src/client/assets/room/furnitures/moon/moon.glb Binary files differdeleted file mode 100644 index 07fa7e4c02..0000000000 --- a/src/client/assets/room/furnitures/moon/moon.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/moon/moon.jpg b/src/client/assets/room/furnitures/moon/moon.jpg Binary files differdeleted file mode 100644 index 8988ac64b9..0000000000 --- a/src/client/assets/room/furnitures/moon/moon.jpg +++ /dev/null diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.blend b/src/client/assets/room/furnitures/mousepad/mousepad.blend Binary files differdeleted file mode 100644 index 14bd139c94..0000000000 --- a/src/client/assets/room/furnitures/mousepad/mousepad.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.glb b/src/client/assets/room/furnitures/mousepad/mousepad.glb Binary files differdeleted file mode 100644 index 681ada49cd..0000000000 --- a/src/client/assets/room/furnitures/mousepad/mousepad.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.png b/src/client/assets/room/furnitures/pc/motherboard-uv.png Binary files differdeleted file mode 100644 index 355009fe7c..0000000000 --- a/src/client/assets/room/furnitures/pc/motherboard-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.psd b/src/client/assets/room/furnitures/pc/motherboard-uv.psd Binary files differdeleted file mode 100644 index 971f33f79e..0000000000 --- a/src/client/assets/room/furnitures/pc/motherboard-uv.psd +++ /dev/null diff --git a/src/client/assets/room/furnitures/pc/motherboard.jpg b/src/client/assets/room/furnitures/pc/motherboard.jpg Binary files differdeleted file mode 100644 index d894e4efcf..0000000000 --- a/src/client/assets/room/furnitures/pc/motherboard.jpg +++ /dev/null diff --git a/src/client/assets/room/furnitures/pc/pc.blend b/src/client/assets/room/furnitures/pc/pc.blend Binary files differdeleted file mode 100644 index 13dfec6ccc..0000000000 --- a/src/client/assets/room/furnitures/pc/pc.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/pc/pc.glb b/src/client/assets/room/furnitures/pc/pc.glb Binary files differdeleted file mode 100644 index 44a48b18ae..0000000000 --- a/src/client/assets/room/furnitures/pc/pc.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/pencil/pencil.blend b/src/client/assets/room/furnitures/pencil/pencil.blend Binary files differdeleted file mode 100644 index 0fc6bdd776..0000000000 --- a/src/client/assets/room/furnitures/pencil/pencil.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/pencil/pencil.glb b/src/client/assets/room/furnitures/pencil/pencil.glb Binary files differdeleted file mode 100644 index a938b5cdcc..0000000000 --- a/src/client/assets/room/furnitures/pencil/pencil.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/photoframe/photo-uv.png b/src/client/assets/room/furnitures/photoframe/photo-uv.png Binary files differdeleted file mode 100644 index 9b94906413..0000000000 --- a/src/client/assets/room/furnitures/photoframe/photo-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/photoframe/photo.jpg b/src/client/assets/room/furnitures/photoframe/photo.jpg Binary files differdeleted file mode 100644 index af14f0f36a..0000000000 --- a/src/client/assets/room/furnitures/photoframe/photo.jpg +++ /dev/null diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.blend b/src/client/assets/room/furnitures/photoframe/photoframe.blend Binary files differdeleted file mode 100644 index 4224cde45b..0000000000 --- a/src/client/assets/room/furnitures/photoframe/photoframe.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.glb b/src/client/assets/room/furnitures/photoframe/photoframe.glb Binary files differdeleted file mode 100644 index 4255a77de6..0000000000 --- a/src/client/assets/room/furnitures/photoframe/photoframe.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/piano/piano.blend b/src/client/assets/room/furnitures/piano/piano.blend Binary files differdeleted file mode 100644 index 7653cdf672..0000000000 --- a/src/client/assets/room/furnitures/piano/piano.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/piano/piano.glb b/src/client/assets/room/furnitures/piano/piano.glb Binary files differdeleted file mode 100644 index 7242e78ceb..0000000000 --- a/src/client/assets/room/furnitures/piano/piano.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.blend b/src/client/assets/room/furnitures/pinguin/pinguin.blend Binary files differdeleted file mode 100644 index 514c713e4c..0000000000 --- a/src/client/assets/room/furnitures/pinguin/pinguin.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.glb b/src/client/assets/room/furnitures/pinguin/pinguin.glb Binary files differdeleted file mode 100644 index 6df34c06e9..0000000000 --- a/src/client/assets/room/furnitures/pinguin/pinguin.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/plant/plant-soil-uv.png b/src/client/assets/room/furnitures/plant/plant-soil-uv.png Binary files differdeleted file mode 100644 index d4971a896c..0000000000 --- a/src/client/assets/room/furnitures/plant/plant-soil-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/plant/plant-soil.png b/src/client/assets/room/furnitures/plant/plant-soil.png Binary files differdeleted file mode 100644 index e79ccd240e..0000000000 --- a/src/client/assets/room/furnitures/plant/plant-soil.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/plant/plant-soil.psd b/src/client/assets/room/furnitures/plant/plant-soil.psd Binary files differdeleted file mode 100644 index 1457b7ea5b..0000000000 --- a/src/client/assets/room/furnitures/plant/plant-soil.psd +++ /dev/null diff --git a/src/client/assets/room/furnitures/plant/plant.blend b/src/client/assets/room/furnitures/plant/plant.blend Binary files differdeleted file mode 100644 index aa38c7b54e..0000000000 --- a/src/client/assets/room/furnitures/plant/plant.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/plant/plant.glb b/src/client/assets/room/furnitures/plant/plant.glb Binary files differdeleted file mode 100644 index 38422b4a9b..0000000000 --- a/src/client/assets/room/furnitures/plant/plant.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/plant2/plant2.blend b/src/client/assets/room/furnitures/plant2/plant2.blend Binary files differdeleted file mode 100644 index 6592c5d98d..0000000000 --- a/src/client/assets/room/furnitures/plant2/plant2.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/plant2/plant2.glb b/src/client/assets/room/furnitures/plant2/plant2.glb Binary files differdeleted file mode 100644 index 223e6f5834..0000000000 --- a/src/client/assets/room/furnitures/plant2/plant2.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/plant2/soil.png b/src/client/assets/room/furnitures/plant2/soil.png Binary files differdeleted file mode 100644 index e79ccd240e..0000000000 --- a/src/client/assets/room/furnitures/plant2/soil.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.blend b/src/client/assets/room/furnitures/poster-h/poster-h.blend Binary files differdeleted file mode 100644 index 40f944f3c1..0000000000 --- a/src/client/assets/room/furnitures/poster-h/poster-h.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.glb b/src/client/assets/room/furnitures/poster-h/poster-h.glb Binary files differdeleted file mode 100644 index c6032c1009..0000000000 --- a/src/client/assets/room/furnitures/poster-h/poster-h.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/poster-h/uv.png b/src/client/assets/room/furnitures/poster-h/uv.png Binary files differdeleted file mode 100644 index f854231e0b..0000000000 --- a/src/client/assets/room/furnitures/poster-h/uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.blend b/src/client/assets/room/furnitures/poster-v/poster-v.blend Binary files differdeleted file mode 100644 index 07fe971634..0000000000 --- a/src/client/assets/room/furnitures/poster-v/poster-v.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.glb b/src/client/assets/room/furnitures/poster-v/poster-v.glb Binary files differdeleted file mode 100644 index 6e3782f193..0000000000 --- a/src/client/assets/room/furnitures/poster-v/poster-v.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/poster-v/uv.png b/src/client/assets/room/furnitures/poster-v/uv.png Binary files differdeleted file mode 100644 index 7bb2bf809e..0000000000 --- a/src/client/assets/room/furnitures/poster-v/uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/pudding/pudding.blend b/src/client/assets/room/furnitures/pudding/pudding.blend Binary files differdeleted file mode 100644 index bba40ce161..0000000000 --- a/src/client/assets/room/furnitures/pudding/pudding.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/pudding/pudding.glb b/src/client/assets/room/furnitures/pudding/pudding.glb Binary files differdeleted file mode 100644 index 06c9ed80cc..0000000000 --- a/src/client/assets/room/furnitures/pudding/pudding.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend Binary files differdeleted file mode 100644 index 6c09067e78..0000000000 --- a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb Binary files differdeleted file mode 100644 index d640df9b06..0000000000 --- a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/server/rack-uv.png b/src/client/assets/room/furnitures/server/rack-uv.png Binary files differdeleted file mode 100644 index 65bdb0ffd9..0000000000 --- a/src/client/assets/room/furnitures/server/rack-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/server/rack.png b/src/client/assets/room/furnitures/server/rack.png Binary files differdeleted file mode 100644 index b851295cfa..0000000000 --- a/src/client/assets/room/furnitures/server/rack.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/server/server.blend b/src/client/assets/room/furnitures/server/server.blend Binary files differdeleted file mode 100644 index 6675dfbdc2..0000000000 --- a/src/client/assets/room/furnitures/server/server.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/server/server.glb b/src/client/assets/room/furnitures/server/server.glb Binary files differdeleted file mode 100644 index a8b530a2d2..0000000000 --- a/src/client/assets/room/furnitures/server/server.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/server/server.png b/src/client/assets/room/furnitures/server/server.png Binary files differdeleted file mode 100644 index 8e9a0d716c..0000000000 --- a/src/client/assets/room/furnitures/server/server.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/server/uv.png b/src/client/assets/room/furnitures/server/uv.png Binary files differdeleted file mode 100644 index ca2e747d16..0000000000 --- a/src/client/assets/room/furnitures/server/uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/sofa/sofa.blend b/src/client/assets/room/furnitures/sofa/sofa.blend Binary files differdeleted file mode 100644 index fb5aa51a2c..0000000000 --- a/src/client/assets/room/furnitures/sofa/sofa.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/sofa/sofa.glb b/src/client/assets/room/furnitures/sofa/sofa.glb Binary files differdeleted file mode 100644 index 6ce77d94ac..0000000000 --- a/src/client/assets/room/furnitures/sofa/sofa.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/spiral/spiral.blend b/src/client/assets/room/furnitures/spiral/spiral.blend Binary files differdeleted file mode 100644 index 9d3be77bce..0000000000 --- a/src/client/assets/room/furnitures/spiral/spiral.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/spiral/spiral.glb b/src/client/assets/room/furnitures/spiral/spiral.glb Binary files differdeleted file mode 100644 index ee8e3c23b1..0000000000 --- a/src/client/assets/room/furnitures/spiral/spiral.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/tv/screen-uv.png b/src/client/assets/room/furnitures/tv/screen-uv.png Binary files differdeleted file mode 100644 index 4bb74f031f..0000000000 --- a/src/client/assets/room/furnitures/tv/screen-uv.png +++ /dev/null diff --git a/src/client/assets/room/furnitures/tv/tv.blend b/src/client/assets/room/furnitures/tv/tv.blend Binary files differdeleted file mode 100644 index 490e298e7b..0000000000 --- a/src/client/assets/room/furnitures/tv/tv.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/tv/tv.glb b/src/client/assets/room/furnitures/tv/tv.glb Binary files differdeleted file mode 100644 index b9bd23896b..0000000000 --- a/src/client/assets/room/furnitures/tv/tv.glb +++ /dev/null diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.blend b/src/client/assets/room/furnitures/wall-clock/wall-clock.blend Binary files differdeleted file mode 100644 index 0a61c8f01e..0000000000 --- a/src/client/assets/room/furnitures/wall-clock/wall-clock.blend +++ /dev/null diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.glb b/src/client/assets/room/furnitures/wall-clock/wall-clock.glb Binary files differdeleted file mode 100644 index b9f0093a8d..0000000000 --- a/src/client/assets/room/furnitures/wall-clock/wall-clock.glb +++ /dev/null diff --git a/src/client/assets/room/rooms/default/default.blend b/src/client/assets/room/rooms/default/default.blend Binary files differdeleted file mode 100644 index 661154724a..0000000000 --- a/src/client/assets/room/rooms/default/default.blend +++ /dev/null diff --git a/src/client/assets/room/rooms/default/default.glb b/src/client/assets/room/rooms/default/default.glb Binary files differdeleted file mode 100644 index 3d378deee2..0000000000 --- a/src/client/assets/room/rooms/default/default.glb +++ /dev/null diff --git a/src/client/assets/room/rooms/washitsu/husuma-uv.png b/src/client/assets/room/rooms/washitsu/husuma-uv.png Binary files differdeleted file mode 100644 index ae2fca3911..0000000000 --- a/src/client/assets/room/rooms/washitsu/husuma-uv.png +++ /dev/null diff --git a/src/client/assets/room/rooms/washitsu/husuma.png b/src/client/assets/room/rooms/washitsu/husuma.png Binary files differdeleted file mode 100644 index 084cbed67c..0000000000 --- a/src/client/assets/room/rooms/washitsu/husuma.png +++ /dev/null diff --git a/src/client/assets/room/rooms/washitsu/tatami-single1600.png b/src/client/assets/room/rooms/washitsu/tatami-single1600.png Binary files differdeleted file mode 100644 index c0e684d743..0000000000 --- a/src/client/assets/room/rooms/washitsu/tatami-single1600.png +++ /dev/null diff --git a/src/client/assets/room/rooms/washitsu/tatami-uv.png b/src/client/assets/room/rooms/washitsu/tatami-uv.png Binary files differdeleted file mode 100644 index 5b16c66091..0000000000 --- a/src/client/assets/room/rooms/washitsu/tatami-uv.png +++ /dev/null diff --git a/src/client/assets/room/rooms/washitsu/tatami.afdesign b/src/client/assets/room/rooms/washitsu/tatami.afdesign Binary files differdeleted file mode 100644 index 9300a26950..0000000000 --- a/src/client/assets/room/rooms/washitsu/tatami.afdesign +++ /dev/null diff --git a/src/client/assets/room/rooms/washitsu/tatami.png b/src/client/assets/room/rooms/washitsu/tatami.png Binary files differdeleted file mode 100644 index 8894d040ae..0000000000 --- a/src/client/assets/room/rooms/washitsu/tatami.png +++ /dev/null diff --git a/src/client/assets/room/rooms/washitsu/washitsu.blend b/src/client/assets/room/rooms/washitsu/washitsu.blend Binary files differdeleted file mode 100644 index 84dc11374d..0000000000 --- a/src/client/assets/room/rooms/washitsu/washitsu.blend +++ /dev/null diff --git a/src/client/assets/room/rooms/washitsu/washitsu.glb b/src/client/assets/room/rooms/washitsu/washitsu.glb Binary files differdeleted file mode 100644 index 5b4767bc73..0000000000 --- a/src/client/assets/room/rooms/washitsu/washitsu.glb +++ /dev/null diff --git a/src/client/assets/sounds/aisha/1.mp3 b/src/client/assets/sounds/aisha/1.mp3 Binary files differdeleted file mode 100644 index d8e9a2f265..0000000000 --- a/src/client/assets/sounds/aisha/1.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/aisha/2.mp3 b/src/client/assets/sounds/aisha/2.mp3 Binary files differdeleted file mode 100644 index 477c2eba43..0000000000 --- a/src/client/assets/sounds/aisha/2.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/aisha/3.mp3 b/src/client/assets/sounds/aisha/3.mp3 Binary files differdeleted file mode 100644 index fe0d8063df..0000000000 --- a/src/client/assets/sounds/aisha/3.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/noizenecio/kick_gaba.mp3 b/src/client/assets/sounds/noizenecio/kick_gaba.mp3 Binary files differdeleted file mode 100644 index 616b506c4f..0000000000 --- a/src/client/assets/sounds/noizenecio/kick_gaba.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/noizenecio/kick_gaba2.mp3 b/src/client/assets/sounds/noizenecio/kick_gaba2.mp3 Binary files differdeleted file mode 100644 index 33c2837620..0000000000 --- a/src/client/assets/sounds/noizenecio/kick_gaba2.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/down.mp3 b/src/client/assets/sounds/syuilo/down.mp3 Binary files differdeleted file mode 100644 index 4cd421139d..0000000000 --- a/src/client/assets/sounds/syuilo/down.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/kick.mp3 b/src/client/assets/sounds/syuilo/kick.mp3 Binary files differdeleted file mode 100644 index 4e0e72091c..0000000000 --- a/src/client/assets/sounds/syuilo/kick.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/pirori-square-wet.mp3 b/src/client/assets/sounds/syuilo/pirori-square-wet.mp3 Binary files differdeleted file mode 100644 index babf1fce60..0000000000 --- a/src/client/assets/sounds/syuilo/pirori-square-wet.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/pirori-wet.mp3 b/src/client/assets/sounds/syuilo/pirori-wet.mp3 Binary files differdeleted file mode 100644 index 25e2c46a64..0000000000 --- a/src/client/assets/sounds/syuilo/pirori-wet.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/pirori.mp3 b/src/client/assets/sounds/syuilo/pirori.mp3 Binary files differdeleted file mode 100644 index a745415ac0..0000000000 --- a/src/client/assets/sounds/syuilo/pirori.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/poi1.mp3 b/src/client/assets/sounds/syuilo/poi1.mp3 Binary files differdeleted file mode 100644 index 59dae90965..0000000000 --- a/src/client/assets/sounds/syuilo/poi1.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/poi2.mp3 b/src/client/assets/sounds/syuilo/poi2.mp3 Binary files differdeleted file mode 100644 index a65c653891..0000000000 --- a/src/client/assets/sounds/syuilo/poi2.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/pope1.mp3 b/src/client/assets/sounds/syuilo/pope1.mp3 Binary files differdeleted file mode 100644 index d6f53cfacc..0000000000 --- a/src/client/assets/sounds/syuilo/pope1.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/pope2.mp3 b/src/client/assets/sounds/syuilo/pope2.mp3 Binary files differdeleted file mode 100644 index fe5d95e292..0000000000 --- a/src/client/assets/sounds/syuilo/pope2.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/popo.mp3 b/src/client/assets/sounds/syuilo/popo.mp3 Binary files differdeleted file mode 100644 index a2a1605bbb..0000000000 --- a/src/client/assets/sounds/syuilo/popo.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/reverved.mp3 b/src/client/assets/sounds/syuilo/reverved.mp3 Binary files differdeleted file mode 100644 index 47588ef270..0000000000 --- a/src/client/assets/sounds/syuilo/reverved.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/ryukyu.mp3 b/src/client/assets/sounds/syuilo/ryukyu.mp3 Binary files differdeleted file mode 100644 index 9e935e3f37..0000000000 --- a/src/client/assets/sounds/syuilo/ryukyu.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/snare.mp3 b/src/client/assets/sounds/syuilo/snare.mp3 Binary files differdeleted file mode 100644 index 9244189c2d..0000000000 --- a/src/client/assets/sounds/syuilo/snare.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/square-pico.mp3 b/src/client/assets/sounds/syuilo/square-pico.mp3 Binary files differdeleted file mode 100644 index c4d8305ae7..0000000000 --- a/src/client/assets/sounds/syuilo/square-pico.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/triple.mp3 b/src/client/assets/sounds/syuilo/triple.mp3 Binary files differdeleted file mode 100644 index 54ab974d46..0000000000 --- a/src/client/assets/sounds/syuilo/triple.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/up.mp3 b/src/client/assets/sounds/syuilo/up.mp3 Binary files differdeleted file mode 100644 index 3f30867764..0000000000 --- a/src/client/assets/sounds/syuilo/up.mp3 +++ /dev/null diff --git a/src/client/assets/sounds/syuilo/waon.mp3 b/src/client/assets/sounds/syuilo/waon.mp3 Binary files differdeleted file mode 100644 index a4af473861..0000000000 --- a/src/client/assets/sounds/syuilo/waon.mp3 +++ /dev/null diff --git a/src/client/components/emoji-picker-dialog.vue b/src/client/components/emoji-picker-dialog.vue index affc1ccf39..4b165d9f91 100644 --- a/src/client/components/emoji-picker-dialog.vue +++ b/src/client/components/emoji-picker-dialog.vue @@ -1,6 +1,6 @@ <template> -<MkModal ref="modal" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')" v-slot="{ showing }"> - <MkEmojiPicker v-show="showing !== false" :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen" ref="picker"/> +<MkModal ref="modal" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')"> + <MkEmojiPicker :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen" ref="picker"/> </MkModal> </template> diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue index f7eaeb2bfe..99d6c8a330 100644 --- a/src/client/components/emoji-picker.vue +++ b/src/client/components/emoji-picker.vue @@ -279,6 +279,7 @@ export default defineComponent({ reset() { this.$refs.emojis.scrollTop = 0; + this.q = ''; }, getKey(emoji: any) { diff --git a/src/client/components/media-video.vue b/src/client/components/media-video.vue index 3788947206..bdd3983e1e 100644 --- a/src/client/components/media-video.vue +++ b/src/client/components/media-video.vue @@ -6,22 +6,24 @@ </div> </div> <div class="kkjnbbplepmiyuadieoenjgutgcmtsvu" v-else> - <i><Fa :icon="faEyeSlash" @click="hide = true"/></i> - <a - :href="video.url" - rel="nofollow noopener" - target="_blank" - :style="imageStyle" + <video + :poster="video.thumbnailUrl" :title="video.name" + crossorigin="anonymous" + preload="none" + controls > - <Fa :icon="faPlayCircle"/> - </a> + <source + :src="video.url" + :type="video.type" + > + </video> + <i><Fa :icon="faEyeSlash" @click="hide = true"/></i> </div> </template> <script lang="ts"> import { defineComponent } from 'vue'; -import { faPlayCircle } from '@fortawesome/free-regular-svg-icons'; import { faExclamationTriangle, faEyeSlash } from '@fortawesome/free-solid-svg-icons'; import * as os from '@/os'; @@ -35,18 +37,10 @@ export default defineComponent({ data() { return { hide: true, - faPlayCircle, faExclamationTriangle, faEyeSlash }; }, - computed: { - imageStyle(): any { - return { - 'background-image': `url(${this.video.thumbnailUrl})` - }; - } - }, created() { this.hide = (this.$store.state.nsfw === 'force') ? true : this.video.isSensitive && (this.$store.state.nsfw !== 'ignore'); }, @@ -72,7 +66,7 @@ export default defineComponent({ right: 12px; } - > a { + > video { display: flex; justify-content: center; align-items: center; diff --git a/src/client/components/note-detailed.vue b/src/client/components/note-detailed.vue index b5bc054e5e..1ef3f43389 100644 --- a/src/client/components/note-detailed.vue +++ b/src/client/components/note-detailed.vue @@ -140,6 +140,7 @@ import { checkWordMute } from '@/scripts/check-word-mute'; import { userPage } from '@/filters/user'; import * as os from '@/os'; import { noteActions, noteViewInterruptors } from '@/store'; +import { reactionPicker } from '@/scripts/reaction-picker'; function markRawAll(...xs) { for (const x of xs) { @@ -523,7 +524,7 @@ export default defineComponent({ react(viaKeyboard = false) { pleaseLogin(); this.blur(); - os.pickReaction(this.$refs.reactButton, reaction => { + reactionPicker.show(this.$refs.reactButton, reaction => { os.api('notes/reactions/create', { noteId: this.appearNote.id, reaction: reaction diff --git a/src/client/components/note.vue b/src/client/components/note.vue index bc2f87fe85..65e09b7802 100644 --- a/src/client/components/note.vue +++ b/src/client/components/note.vue @@ -122,6 +122,7 @@ import { checkWordMute } from '@/scripts/check-word-mute'; import { userPage } from '@/filters/user'; import * as os from '@/os'; import { noteActions, noteViewInterruptors } from '@/store'; +import { reactionPicker } from '@/scripts/reaction-picker'; function markRawAll(...xs) { for (const x of xs) { @@ -498,7 +499,7 @@ export default defineComponent({ react(viaKeyboard = false) { pleaseLogin(); this.blur(); - os.pickReaction(this.$refs.reactButton, reaction => { + reactionPicker.show(this.$refs.reactButton, reaction => { os.api('notes/reactions/create', { noteId: this.appearNote.id, reaction: reaction diff --git a/src/client/components/ui/modal.vue b/src/client/components/ui/modal.vue index 23c153e5f7..ff5b98d39f 100644 --- a/src/client/components/ui/modal.vue +++ b/src/client/components/ui/modal.vue @@ -1,14 +1,12 @@ <template> -<div class="mk-modal" v-hotkey.global="keymap" :style="{ pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }"> - <transition :name="$store.state.animation ? 'modal-bg' : ''" appear> - <div class="bg _modalBg" v-if="manualShowing != null ? manualShowing : showing" @click="onBgClick"></div> - </transition> - <div class="content" :class="{ popup, fixed, top: position === 'top' }" @click.self="onBgClick" ref="content"> - <transition :name="$store.state.animation ? popup ? 'modal-popup-content' : 'modal-content' : ''" appear @after-leave="$emit('closed')" @enter="$emit('opening')" @after-enter="childRendered"> - <slot v-if="manualShowing != null ? true : showing" v-bind:showing="manualShowing"></slot> - </transition> +<transition :name="$store.state.animation ? popup ? 'modal-popup' : 'modal' : ''" appear @after-leave="onClosed" @enter="$emit('opening')" @after-enter="childRendered"> + <div v-show="manualShowing != null ? manualShowing : showing" class="mk-modal" v-hotkey.global="keymap" :style="{ pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }"> + <div class="bg _modalBg" @click="onBgClick"></div> + <div class="content" :class="{ popup, fixed, top: position === 'top' }" @click.self="onBgClick" ref="content"> + <slot></slot> + </div> </div> -</div> +</transition> </template> <script lang="ts"> @@ -85,6 +83,8 @@ export default defineComponent({ const popover = this.$refs.content as any; + if (popover == null) return; + const rect = this.src.getBoundingClientRect(); const width = popover.offsetWidth; @@ -163,42 +163,71 @@ export default defineComponent({ onBgClick() { if (this.contentClicking) return; this.$emit('click'); + }, + + onClosed() { + this.$emit('closed'); } } }); </script> -<style> -.modal-popup-content-enter-active, .modal-popup-content-leave-active, -.modal-content-enter-from, .modal-content-leave-to { - transform-origin: var(--transformOrigin); +<style lang="scss"> +.modal-popup-enter-active, .modal-popup-leave-active, +.modal-enter-from, .modal-leave-to { + > .content { + transform-origin: var(--transformOrigin); + } } </style> <style lang="scss" scoped> -.modal-bg-enter-active, .modal-bg-leave-active { - transition: opacity 0.3s !important; -} -.modal-bg-enter-from, .modal-bg-leave-to { - opacity: 0; -} - -.modal-content-enter-active, .modal-content-leave-active { +.modal-enter-active, .modal-leave-active { + // CSS的には無意味だけどこれが無いとVueが認識しない transition: opacity 0.3s, transform 0.3s !important; + + > .bg { + transition: opacity 0.3s !important; + } + + > .content { + transition: opacity 0.3s, transform 0.3s !important; + } } -.modal-content-enter-from, .modal-content-leave-to { - pointer-events: none; - opacity: 0; - transform: scale(0.9); +.modal-enter-from, .modal-leave-to { + > .bg { + opacity: 0; + } + + > .content { + pointer-events: none; + opacity: 0; + transform: scale(0.9); + } } -.modal-popup-content-enter-active, .modal-popup-content-leave-active { +.modal-popup-enter-active, .modal-popup-leave-active { + // CSS的には無意味だけどこれが無いとVueが認識しない transition: opacity 0.5s cubic-bezier(0.16, 1, 0.3, 1), transform 0.5s cubic-bezier(0.16, 1, 0.3, 1) !important; + + > .bg { + transition: opacity 0.3s !important; + } + + > .content { + transition: opacity 0.5s cubic-bezier(0.16, 1, 0.3, 1), transform 0.5s cubic-bezier(0.16, 1, 0.3, 1) !important; + } } -.modal-popup-content-enter-from, .modal-popup-content-leave-to { - pointer-events: none; - opacity: 0; - transform: scale(0.9); +.modal-popup-enter-from, .modal-popup-leave-to { + > .bg { + opacity: 0; + } + + > .content { + pointer-events: none; + opacity: 0; + transform: scale(0.9); + } } .mk-modal { @@ -227,12 +256,12 @@ export default defineComponent({ mask-image: linear-gradient(0deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 16px, rgba(0,0,0,1) calc(100% - 16px), rgba(0,0,0,0) 100%); } - > * { + > ::v-deep(*) { margin: auto; } &.top { - > * { + > ::v-deep(*) { margin-top: 0; } } diff --git a/src/client/init.ts b/src/client/init.ts index b3c53db7bb..1c44e7f23e 100644 --- a/src/client/init.ts +++ b/src/client/init.ts @@ -62,6 +62,7 @@ import { isMobile } from '@/scripts/is-mobile'; import { getThemes } from '@/theme-store'; import { initializeSw } from '@/scripts/initialize-sw'; import { reloadChannel } from '@/scripts/unison-reload'; +import { reactionPicker } from '@/scripts/reaction-picker'; console.info(`Misskey v${version}`); @@ -219,9 +220,22 @@ components(app); await router.isReady(); -//document.body.innerHTML = '<div id="app"></div>'; +const splash = document.getElementById('splash'); +// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す)) +if (splash) splash.addEventListener('transitionend', () => { + splash.remove(); +}); + +const rootEl = document.createElement('div'); +document.body.appendChild(rootEl); +app.mount(rootEl); -app.mount('body'); +reactionPicker.init(); + +if (splash) { + splash.style.opacity = '0'; + splash.style.pointerEvents = 'none'; +} watch(defaultStore.reactiveState.darkMode, (darkMode) => { import('@/scripts/theme').then(({ builtinThemes }) => { diff --git a/src/client/os.ts b/src/client/os.ts index 2b72391bf5..9be45e6c6d 100644 --- a/src/client/os.ts +++ b/src/client/os.ts @@ -357,38 +357,6 @@ export async function openEmojiPicker(src?: HTMLElement, opts, initialTextarea: }); } -let reactionPicker = null; -export async function pickReaction(src: HTMLElement, chosen, closed) { - if (reactionPicker) { - reactionPicker.src.value = src; - reactionPicker.manualShowing.value = true; - reactionPicker.chosen = chosen; - reactionPicker.closed = closed; - } else { - reactionPicker = { - src: ref(src), - manualShowing: ref(true), - chosen, closed - }; - popup(import('@/components/emoji-picker-dialog.vue'), { - src: reactionPicker.src, - asReactionPicker: true, - manualShowing: reactionPicker.manualShowing - }, { - done: reaction => { - reactionPicker.chosen(reaction); - }, - close: () => { - reactionPicker.manualShowing.value = false; - }, - closed: () => { - reactionPicker.src.value = null; - reactionPicker.closed(); - } - }); - } -} - export function modalMenu(items: any[], src?: HTMLElement, options?: { align?: string; viaKeyboard?: boolean }) { return new Promise((resolve, reject) => { let dispose; diff --git a/src/client/pages/settings/theme.manage.vue b/src/client/pages/settings/theme.manage.vue index 5b9e075305..f08c354718 100644 --- a/src/client/pages/settings/theme.manage.vue +++ b/src/client/pages/settings/theme.manage.vue @@ -93,6 +93,8 @@ export default defineComponent({ uninstall() { removeTheme(this.selectedTheme); + this.selectedThemeId = null; + os.success(); }, } }); diff --git a/src/client/pages/v.vue b/src/client/pages/v.vue index 021f8908fb..f456a29993 100644 --- a/src/client/pages/v.vue +++ b/src/client/pages/v.vue @@ -2,7 +2,7 @@ <div> <section class="_section"> <div class="_content" style="text-align: center;"> - <img src="/assets/icons/512.png" alt="" style="display: block; width: 100px; margin: 0 auto; border-radius: 16px;"/> + <img src="/static-assets/icons/512.png" alt="" style="display: block; width: 100px; margin: 0 auto; border-radius: 16px;"/> <div style="margin-top: 0.75em;">Misskey</div> <div style="opacity: 0.5;">v{{ version }}</div> </div> diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue index 4d356774eb..872ea8797f 100644 --- a/src/client/pages/welcome.entrance.a.vue +++ b/src/client/pages/welcome.entrance.a.vue @@ -3,8 +3,9 @@ <div class="top"> <MkFeaturedPhotos class="bg"/> <XTimeline class="tl"/> - <div class="shape"></div> - <img src="/assets/misskey.svg" class="misskey"/> + <div class="shape1"></div> + <div class="shape2"></div> + <img src="/static-assets/misskey.svg" class="misskey"/> <div class="emojis"> <MkEmoji :normal="true" :no-style="true" emoji="👍"/> <MkEmoji :normal="true" :no-style="true" emoji="❤"/> @@ -18,7 +19,9 @@ </div> <div class="fg"> <h1> - <img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span> + <!-- 背景色によってはロゴが見えなくなるのでとりあえず無効に --> + <!-- <img class="logo" v-if="meta.logoImageUrl" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span> --> + <span class="text">{{ instanceName }}</span> </h1> <div class="about"> <div class="desc" v-html="meta.description || $ts.headlineMisskey"></div> @@ -154,8 +157,8 @@ export default defineComponent({ > .bg { position: absolute; top: 0; - left: 0; - width: 100%; + right: 0; + width: 80%; // 100%からshapeの幅を引いている height: 100%; } @@ -176,14 +179,24 @@ export default defineComponent({ } } - > .shape { + > .shape1 { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: var(--accent); + clip-path: polygon(0% 0%, 45% 0%, 20% 100%, 0% 100%); + } + > .shape2 { position: absolute; top: 0; left: 0; width: 100%; height: 100%; background: var(--accent); - clip-path: polygon(0% 0%, 50% 0%, 15% 100%, 0% 100%); + clip-path: polygon(0% 0%, 25% 0%, 35% 100%, 0% 100%); + opacity: 0.5; } > .misskey { diff --git a/src/client/pages/welcome.entrance.b.vue b/src/client/pages/welcome.entrance.b.vue index 8a6f60e726..95b99fb466 100644 --- a/src/client/pages/welcome.entrance.b.vue +++ b/src/client/pages/welcome.entrance.b.vue @@ -29,7 +29,7 @@ </I18n> </div> </div> - <img src="/assets/misskey.svg" class="misskey"/> + <img src="/static-assets/misskey.svg" class="misskey"/> </div> </div> </template> diff --git a/src/client/pages/welcome.entrance.c.vue b/src/client/pages/welcome.entrance.c.vue index e9df492cb6..8aba80e781 100644 --- a/src/client/pages/welcome.entrance.c.vue +++ b/src/client/pages/welcome.entrance.c.vue @@ -11,7 +11,7 @@ <MkEmoji :normal="true" :no-style="true" emoji="🍮"/> </div> <div class="main"> - <img src="/assets/misskey.svg" class="misskey"/> + <img src="/static-assets/misskey.svg" class="misskey"/> <div class="form _panel"> <div class="bg"> <div class="fade"></div> diff --git a/src/client/scripts/reaction-picker.ts b/src/client/scripts/reaction-picker.ts new file mode 100644 index 0000000000..e923326ece --- /dev/null +++ b/src/client/scripts/reaction-picker.ts @@ -0,0 +1,41 @@ +import { Ref, ref } from 'vue'; +import { popup } from '@/os'; + +class ReactionPicker { + private src: Ref<HTMLElement | null> = ref(null); + private manualShowing = ref(false); + private onChosen?: Function; + private onClosed?: Function; + + constructor() { + // nop + } + + public async init() { + await popup(import('@/components/emoji-picker-dialog.vue'), { + src: this.src, + asReactionPicker: true, + manualShowing: this.manualShowing + }, { + done: reaction => { + this.onChosen!(reaction); + }, + close: () => { + this.manualShowing.value = false; + }, + closed: () => { + this.src.value = null; + this.onClosed!(); + } + }); + } + + public show(src: HTMLElement, onChosen: Function, onClosed: Function) { + this.src.value = src; + this.manualShowing.value = true; + this.onChosen = onChosen; + this.onClosed = onClosed; + } +} + +export const reactionPicker = new ReactionPicker(); diff --git a/src/client/scripts/room/room.ts b/src/client/scripts/room/room.ts index 45ccd59b70..8fe3ebdeb0 100644 --- a/src/client/scripts/room/room.ts +++ b/src/client/scripts/room/room.ts @@ -340,7 +340,7 @@ export class Room { @autobind private loadRoom() { const type = this.roomInfo.roomType; - new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => { + new GLTFLoader().load(`/static-assets/room/rooms/${type}/${type}.glb`, gltf => { gltf.scene.traverse(child => { if (!(child instanceof THREE.Mesh)) return; @@ -375,7 +375,7 @@ export class Room { const def = furnitureDefs.find(d => d.id === furniture.type); return new Promise<GLTF>((res, rej) => { const loader = new GLTFLoader(); - loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { + loader.load(`/static-assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { const model = gltf.scene; // Load animation diff --git a/src/client/scripts/sound.ts b/src/client/scripts/sound.ts index 176d2b68bf..bb4cfee06a 100644 --- a/src/client/scripts/sound.ts +++ b/src/client/scripts/sound.ts @@ -16,7 +16,7 @@ export function playFile(file: string, volume: number) { if (cache.has(file)) { audio = cache.get(file); } else { - audio = new Audio(`/assets/sounds/${file}.mp3`); + audio = new Audio(`/static-assets/sounds/${file}.mp3`); cache.set(file, audio); } audio.volume = masterVolume - ((1 - volume) * masterVolume); diff --git a/src/client/store.ts b/src/client/store.ts index 528e563fdd..14924dadd0 100644 --- a/src/client/store.ts +++ b/src/client/store.ts @@ -213,6 +213,8 @@ type Plugin = { export class ColdDeviceStorage { public static default = { themes: [] as Theme[], // TODO: そのうち消す + // TODO: テーマをアカウントに保存するようになったのにもかかわらず、以下のどのテーマを使うかという情報だけがブラウザ保存になっていて、アカウント切り替えたりログアウトしたときに不具合が発生するのでなんとかする + // テーマIDを保存するのではなく、テーマ自体を保存するようにすれば解決するかも darkTheme: '8050783a-7f63-445a-b270-36d0f6ba1677', lightTheme: '4eea646f-7afa-4645-83e9-83af0333cd37', syncDeviceDarkMode: true, diff --git a/src/client/ui/chat/note.vue b/src/client/ui/chat/note.vue index bd7bbc5a4f..5a4a13d889 100644 --- a/src/client/ui/chat/note.vue +++ b/src/client/ui/chat/note.vue @@ -121,6 +121,7 @@ import { checkWordMute } from '@/scripts/check-word-mute'; import { userPage } from '@/filters/user'; import * as os from '@/os'; import { noteActions, noteViewInterruptors } from '@/store'; +import { reactionPicker } from '@/scripts/reaction-picker'; function markRawAll(...xs) { for (const x of xs) { @@ -504,7 +505,7 @@ export default defineComponent({ pleaseLogin(); this.operating = true; this.blur(); - os.pickReaction(this.$refs.reactButton, reaction => { + reactionPicker.show(this.$refs.reactButton, reaction => { os.api('notes/reactions/create', { noteId: this.appearNote.id, reaction: reaction |
