profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
syuilo 2021-03-07 14:43:00 +09:00
commit 18693fb380
204 changed files with 211 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/client/assets/about-icon.png → assets/client/about-icon.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
src/client/assets/fedi.jpg → assets/client/fedi.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

0
src/client/assets/label-red.svg → assets/client/label-red.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 441 B

After

Width:  |  Height:  |  Size: 441 B

0
src/client/assets/label.svg → assets/client/label.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 441 B

After

Width:  |  Height:  |  Size: 441 B

0
src/client/assets/manifest.json → assets/client/manifest.json
View file

0
src/client/assets/misskey.svg → assets/client/misskey.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

0
src/client/assets/remove.png → assets/client/remove.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 424 B

0
assets/room/furnitures/banknote/banknote.blend → assets/client/room/furnitures/banknote/banknote.blend
View file

0
assets/room/furnitures/banknote/banknote.glb → assets/client/room/furnitures/banknote/banknote.glb
View file

0
assets/room/furnitures/banknote/tex.png → assets/client/room/furnitures/banknote/tex.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

0
assets/room/furnitures/bed/bed.blend → assets/client/room/furnitures/bed/bed.blend
View file

0
assets/room/furnitures/bed/bed.glb → assets/client/room/furnitures/bed/bed.glb
View file

0
assets/room/furnitures/bin/bin.blend → assets/client/room/furnitures/bin/bin.blend
View file

0
assets/room/furnitures/bin/bin.glb → assets/client/room/furnitures/bin/bin.glb
View file

0
assets/room/furnitures/book/book.blend → assets/client/room/furnitures/book/book.blend
View file

0
assets/room/furnitures/book/book.glb → assets/client/room/furnitures/book/book.glb
View file

0
assets/room/furnitures/book2/barcode.png → assets/client/room/furnitures/book2/barcode.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
assets/room/furnitures/book2/book2.blend → assets/client/room/furnitures/book2/book2.blend
View file

0
assets/room/furnitures/book2/book2.glb → assets/client/room/furnitures/book2/book2.glb
View file

0
assets/room/furnitures/book2/texture.afdesign → assets/client/room/furnitures/book2/texture.afdesign
View file

0
assets/room/furnitures/book2/texture.png → assets/client/room/furnitures/book2/texture.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

0
assets/room/furnitures/book2/uv.png → assets/client/room/furnitures/book2/uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

0
assets/room/furnitures/cardboard-box/cardboard-box.blend → assets/client/room/furnitures/cardboard-box/cardboard-box.blend
View file

0
assets/room/furnitures/cardboard-box/cardboard-box.glb → assets/client/room/furnitures/cardboard-box/cardboard-box.glb
View file

0
assets/room/furnitures/cardboard-box2/cardboard-box2.blend → assets/client/room/furnitures/cardboard-box2/cardboard-box2.blend
View file

0
assets/room/furnitures/cardboard-box2/cardboard-box2.glb → assets/client/room/furnitures/cardboard-box2/cardboard-box2.glb
View file

0
assets/room/furnitures/cardboard-box2/texture.png → assets/client/room/furnitures/cardboard-box2/texture.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
assets/room/furnitures/cardboard-box2/uv.png → assets/client/room/furnitures/cardboard-box2/uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
assets/room/furnitures/cardboard-box3/cardboard-box3.blend → assets/client/room/furnitures/cardboard-box3/cardboard-box3.blend
View file

0
assets/room/furnitures/cardboard-box3/cardboard-box3.glb → assets/client/room/furnitures/cardboard-box3/cardboard-box3.glb
View file

0
assets/room/furnitures/cardboard-box3/texture.png → assets/client/room/furnitures/cardboard-box3/texture.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
assets/room/furnitures/cardboard-box3/texture.xcf → assets/client/room/furnitures/cardboard-box3/texture.xcf
View file

0
assets/room/furnitures/cardboard-box3/uv.png → assets/client/room/furnitures/cardboard-box3/uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
assets/room/furnitures/carpet-stripe/carpet-stripe.blend → assets/client/room/furnitures/carpet-stripe/carpet-stripe.blend
View file

0
assets/room/furnitures/carpet-stripe/carpet-stripe.glb → assets/client/room/furnitures/carpet-stripe/carpet-stripe.glb
View file

0
assets/room/furnitures/chair/chair.blend → assets/client/room/furnitures/chair/chair.blend
View file

0
assets/room/furnitures/chair/chair.glb → assets/client/room/furnitures/chair/chair.glb
View file

0
assets/room/furnitures/chair2/chair2.blend → assets/client/room/furnitures/chair2/chair2.blend
View file

0
assets/room/furnitures/chair2/chair2.glb → assets/client/room/furnitures/chair2/chair2.glb
View file

0
assets/room/furnitures/color-box/color-box.blend → assets/client/room/furnitures/color-box/color-box.blend
View file

0
assets/room/furnitures/color-box/color-box.glb → assets/client/room/furnitures/color-box/color-box.glb
View file

0
assets/room/furnitures/corkboard/corkboard.blend → assets/client/room/furnitures/corkboard/corkboard.blend
View file

0
assets/room/furnitures/corkboard/corkboard.glb → assets/client/room/furnitures/corkboard/corkboard.glb
View file

0
assets/room/furnitures/cube/cube.blend → assets/client/room/furnitures/cube/cube.blend
View file

0
assets/room/furnitures/cube/cube.glb → assets/client/room/furnitures/cube/cube.glb
View file

0
assets/room/furnitures/cup-noodle/cup-noodle.blend → assets/client/room/furnitures/cup-noodle/cup-noodle.blend
View file

0
assets/room/furnitures/cup-noodle/cup-noodle.glb → assets/client/room/furnitures/cup-noodle/cup-noodle.glb
View file

0
assets/room/furnitures/cup-noodle/noodle.png → assets/client/room/furnitures/cup-noodle/noodle.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 290 KiB

After

Width:  |  Height:  |  Size: 290 KiB

0
assets/room/furnitures/desk/desk.blend → assets/client/room/furnitures/desk/desk.blend
View file

0
assets/room/furnitures/desk/desk.glb → assets/client/room/furnitures/desk/desk.glb
View file

0
assets/room/furnitures/doll-ai/doll-ai.blend → assets/client/room/furnitures/doll-ai/doll-ai.blend
View file

0
assets/room/furnitures/doll-ai/doll-ai.glb → assets/client/room/furnitures/doll-ai/doll-ai.glb
View file

0
assets/room/furnitures/doll-ai/doll_ai_tex.png → assets/client/room/furnitures/doll-ai/doll_ai_tex.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
assets/room/furnitures/energy-drink/energy-drink.blend → assets/client/room/furnitures/energy-drink/energy-drink.blend
View file

0
assets/room/furnitures/energy-drink/energy-drink.glb → assets/client/room/furnitures/energy-drink/energy-drink.glb
View file

0
assets/room/furnitures/energy-drink/texture.afdesign → assets/client/room/furnitures/energy-drink/texture.afdesign
View file

0
assets/room/furnitures/energy-drink/texture.png → assets/client/room/furnitures/energy-drink/texture.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 124 KiB

0
assets/room/furnitures/energy-drink/uv.png → assets/client/room/furnitures/energy-drink/uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
assets/room/furnitures/eraser/cover.png → assets/client/room/furnitures/eraser/cover.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

0
assets/room/furnitures/eraser/cover.psd → assets/client/room/furnitures/eraser/cover.psd
View file

0
assets/room/furnitures/eraser/eraser-uv.png → assets/client/room/furnitures/eraser/eraser-uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
assets/room/furnitures/eraser/eraser.blend → assets/client/room/furnitures/eraser/eraser.blend
View file

0
assets/room/furnitures/eraser/eraser.glb → assets/client/room/furnitures/eraser/eraser.glb
View file

0
assets/room/furnitures/facial-tissue/facial-tissue-uv.png → assets/client/room/furnitures/facial-tissue/facial-tissue-uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

0
assets/room/furnitures/facial-tissue/facial-tissue.blend → assets/client/room/furnitures/facial-tissue/facial-tissue.blend
View file

0
assets/room/furnitures/facial-tissue/facial-tissue.glb → assets/client/room/furnitures/facial-tissue/facial-tissue.glb
View file

0
assets/room/furnitures/facial-tissue/facial-tissue.png → assets/client/room/furnitures/facial-tissue/facial-tissue.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

0
assets/room/furnitures/facial-tissue/facial-tissue.psd → assets/client/room/furnitures/facial-tissue/facial-tissue.psd
View file

0
assets/room/furnitures/fan/fan.blend → assets/client/room/furnitures/fan/fan.blend
View file

0
assets/room/furnitures/fan/fan.glb → assets/client/room/furnitures/fan/fan.glb
View file

0
assets/room/furnitures/holo-display/holo-display.blend → assets/client/room/furnitures/holo-display/holo-display.blend
View file

0
assets/room/furnitures/holo-display/holo-display.glb → assets/client/room/furnitures/holo-display/holo-display.glb
View file

0
assets/room/furnitures/holo-display/ray-uv.png → assets/client/room/furnitures/holo-display/ray-uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
assets/room/furnitures/holo-display/ray.png → assets/client/room/furnitures/holo-display/ray.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

0
assets/room/furnitures/keyboard/keyboard.blend → assets/client/room/furnitures/keyboard/keyboard.blend
View file

0
assets/room/furnitures/keyboard/keyboard.glb → assets/client/room/furnitures/keyboard/keyboard.glb
View file

0
assets/room/furnitures/low-table/low-table.blend → assets/client/room/furnitures/low-table/low-table.blend
View file

0
assets/room/furnitures/low-table/low-table.glb → assets/client/room/furnitures/low-table/low-table.glb
View file

0
assets/room/furnitures/mat/mat.blend → assets/client/room/furnitures/mat/mat.blend
View file

0
assets/room/furnitures/mat/mat.glb → assets/client/room/furnitures/mat/mat.glb
View file

0
assets/room/furnitures/milk/milk-uv.png → assets/client/room/furnitures/milk/milk-uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
assets/room/furnitures/milk/milk.blend → assets/client/room/furnitures/milk/milk.blend
View file

0
assets/room/furnitures/milk/milk.glb → assets/client/room/furnitures/milk/milk.glb
View file

0
assets/room/furnitures/milk/milk.png → assets/client/room/furnitures/milk/milk.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 658 B

After

Width:  |  Height:  |  Size: 658 B

0
assets/room/furnitures/milk/milk.psd → assets/client/room/furnitures/milk/milk.psd
View file

0
assets/room/furnitures/monitor/monitor.blend → assets/client/room/furnitures/monitor/monitor.blend
View file

0
assets/room/furnitures/monitor/monitor.glb → assets/client/room/furnitures/monitor/monitor.glb
View file

0
assets/room/furnitures/monitor/monitor.psd → assets/client/room/furnitures/monitor/monitor.psd
View file

0
assets/room/furnitures/monitor/screen-uv.png → assets/client/room/furnitures/monitor/screen-uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
assets/room/furnitures/monitor/screen.jpg → assets/client/room/furnitures/monitor/screen.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
assets/room/furnitures/moon/moon.blend → assets/client/room/furnitures/moon/moon.blend
View file

0
assets/room/furnitures/moon/moon.glb → assets/client/room/furnitures/moon/moon.glb
View file

0
assets/room/furnitures/moon/moon.jpg → assets/client/room/furnitures/moon/moon.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

0
assets/room/furnitures/mousepad/mousepad.blend → assets/client/room/furnitures/mousepad/mousepad.blend
View file

0
assets/room/furnitures/mousepad/mousepad.glb → assets/client/room/furnitures/mousepad/mousepad.glb
View file

0
assets/room/furnitures/pc/motherboard-uv.png → assets/client/room/furnitures/pc/motherboard-uv.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
assets/room/furnitures/pc/motherboard-uv.psd → assets/client/room/furnitures/pc/motherboard-uv.psd
View file

0
assets/room/furnitures/pc/motherboard.jpg → assets/client/room/furnitures/pc/motherboard.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

0
assets/room/furnitures/pc/pc.blend → assets/client/room/furnitures/pc/pc.blend
View file

0
assets/room/furnitures/pc/pc.glb → assets/client/room/furnitures/pc/pc.glb
View file

Some files were not shown because too many files have changed in this diff Show more