graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-28 01:43:10 +02:00
Code Issues Projects Releases Packages Wiki Activity
15902 commits 62 branches 916 tags 154 MiB
Commit graph

2599 commits

Author SHA1 Message Date
syuilo
a39c1706a1 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2019-08-22 02:40:19 +09:00
syuilo
c741e27057 [Room] Add holo-display 2019-08-22 02:40:01 +09:00
Aya Morisawa
ede854c215 Update button.vue (#5331) 2019-08-22 02:36:19 +09:00
Oni-Men
630d873ec0 [room]Add cup noodle (#5323) 
* [Room] Add cup noodles

* remove ,

* Fix Cup-Noodle Texture
 2019-08-20 15:57:42 +09:00
syuilo
fcf5531e5b 🎨 2019-08-19 16:44:55 +09:00
syuilo
3bef69ee58 🎨 2019-08-19 16:13:08 +09:00
syuilo
311a4f28b0 Resolve #5298 2019-08-19 16:05:57 +09:00
syuilo
01e692b353 Refactor 2019-08-19 15:59:36 +09:00
syuilo
3b445af6fc Improve readability 2019-08-19 15:51:00 +09:00
syuilo
1e43ece637 [Room] Update model 2019-08-19 14:01:05 +09:00
syuilo
d686e70f2b [Room] Better rendering 2019-08-19 12:35:18 +09:00
syuilo
79c6475028 Improve readability 2019-08-19 02:19:37 +09:00
syuilo
7dee5309dc Refactoring 2019-08-19 02:06:37 +09:00
syuilo
958ec7b03f Fix #5307 2019-08-19 02:02:10 +09:00
syuilo
9153434906 [Room] Add bin 2019-08-19 01:54:06 +09:00
syuilo
3a08364c24 [Room] Add some furnitures 2019-08-19 01:45:20 +09:00
syuilo
a9beeab502 [Room] Better rendering 2019-08-19 01:43:45 +09:00
syuilo
38c901069a [Room] Better avatar rendering 2019-08-19 01:15:30 +09:00
syuilo
3f7606060e Update geometry name 2019-08-19 01:01:15 +09:00
kabo2468
777f20e9be Add Trash can (#5309) 
new file:   src/client/assets/room/furnitures/trash-can/trash-can.blend
	new file:   src/client/assets/room/furnitures/trash-can/trash-can.glb
 2019-08-19 00:51:57 +09:00
syuilo
0f9e09f4bd cors 2019-08-18 20:32:04 +09:00
MeiMei
743ebc17b9 Fix #5291 (#5294) 2019-08-18 20:25:12 +09:00
syuilo
9bc4af76b8 モバイルでもRoomを表示できるように 2019-08-18 19:11:24 +09:00
syuilo
46fa26426d Fix bug 2019-08-18 19:08:33 +09:00
syuilo
bc11702f7d Fix #5290 2019-08-18 16:55:09 +09:00
syuilo
6288de5813 Fix #5291 2019-08-18 16:51:27 +09:00
imgbot[bot]
d7787bacf7 [ImgBot] Optimize images (#5289) 
*Total -- 2,381.44kb -> 1,992.59kb (16.33%)

/src/client/assets/room/furnitures/photoframe/photo-uv.png -- 20.34kb -> 2.58kb (87.33%)
/src/client/assets/room/furnitures/pc/motherboard-uv.png -- 21.43kb -> 2.85kb (86.69%)
/src/client/assets/room/furnitures/cardboard-box3/uv.png -- 21.58kb -> 3.51kb (83.72%)
/src/client/assets/room/furnitures/poster-v/uv.png -- 21.85kb -> 3.71kb (83.04%)
/src/client/assets/room/furnitures/milk/milk.png -- 3.76kb -> 0.64kb (82.89%)
/src/client/assets/room/furnitures/server/uv.png -- 22.29kb -> 3.92kb (82.42%)
/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png -- 3.80kb -> 0.67kb (82.3%)
/src/client/assets/room/rooms/washitsu/tatami-uv.png -- 22.27kb -> 3.98kb (82.13%)
/src/client/assets/room/rooms/washitsu/husuma-uv.png -- 22.06kb -> 3.94kb (82.13%)
/src/client/assets/room/furnitures/tv/screen-uv.png -- 20.55kb -> 3.70kb (81.98%)
/src/client/assets/room/furnitures/poster-h/uv.png -- 20.15kb -> 3.70kb (81.65%)
/src/client/assets/room/furnitures/plant/plant-soil-uv.png -- 23.17kb -> 4.40kb (81%)
/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png -- 22.96kb -> 4.37kb (80.99%)
/src/client/assets/room/furnitures/cardboard-box2/uv.png -- 22.36kb -> 4.52kb (79.78%)
/src/client/assets/room/furnitures/book2/uv.png -- 37.36kb -> 8.41kb (77.49%)
/src/client/assets/room/furnitures/server/rack-uv.png -- 26.68kb -> 6.55kb (75.46%)
/src/client/assets/room/furnitures/monitor/screen-uv.png -- 5.81kb -> 1.46kb (74.88%)
/src/client/assets/room/furnitures/milk/milk-uv.png -- 49.21kb -> 16.19kb (67.1%)
/src/client/assets/room/furnitures/eraser/eraser-uv.png -- 27.93kb -> 10.90kb (60.96%)
/src/client/assets/room/furnitures/book2/barcode.png -- 8.71kb -> 3.42kb (60.72%)
/src/client/assets/room/rooms/washitsu/husuma.png -- 4.23kb -> 2.48kb (41.44%)
/src/client/assets/room/furnitures/server/rack.png -- 9.42kb -> 6.88kb (26.92%)
/src/client/assets/room/furnitures/eraser/cover.png -- 10.75kb -> 8.14kb (24.26%)
/src/client/assets/room/furnitures/plant2/soil.png -- 13.06kb -> 10.60kb (18.83%)
/src/client/assets/room/furnitures/plant/plant-soil.png -- 13.06kb -> 10.60kb (18.83%)
/src/client/assets/room/furnitures/monitor/screen.jpg -- 28.93kb -> 24.26kb (16.16%)
/src/client/assets/room/furnitures/cardboard-box3/texture.png -- 18.23kb -> 15.82kb (13.21%)
/src/client/assets/room/furnitures/cardboard-box2/texture.png -- 18.64kb -> 16.48kb (11.56%)
/src/client/assets/room/furnitures/book2/texture.png -- 64.05kb -> 59.59kb (6.97%)
/src/client/assets/room/furnitures/server/server.png -- 121.75kb -> 114.13kb (6.26%)
/src/client/assets/room/furnitures/pc/motherboard.jpg -- 67.25kb -> 63.09kb (6.19%)
/src/client/assets/room/furnitures/photoframe/photo.jpg -- 31.10kb -> 29.79kb (4.22%)
/src/client/assets/room/rooms/washitsu/tatami-single1600.png -- 1,163.42kb -> 1,145.84kb (1.51%)
/src/client/assets/room/rooms/washitsu/tatami.png -- 308.19kb -> 306.37kb (0.59%)
/src/client/assets/room/furnitures/moon/moon.jpg -- 85.11kb -> 85.11kb (0%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2019-08-18 15:06:22 +09:00
syuilo
45b972c059
MisskeyRoom (#5267) 
* wip

* Add pemcil

* Fix bug

* Update .gitattributes

* Add 🍮

* Better 🍮

* Add color boxes

* Add pc

* Add keyboard

* Add 📦

* Add more 📦

* ✌️

* carpet

* Add plant

* ✌️

* ✌️

* Update room.vue

* Add plant

* ✌️

* ✌️

* ✌️

* ✌️

* ✌️

* 段ボール箱がてかりすぎているのを修正

* Update room.ts

* Render username

* ✌️

* Add new 📦

* Update room.ts

* Remove blender backup files

* Refactor

* Improve performance

* Update room.ts

* Update .gitattributes

* Update room.ts

* Better fan

* Better tissue rendering

* Add 🐧

* Create photoframe2.glb

* chairs

* Add 📖

* fix: HiDPi環境でオブジェクトを選択できない (#5268)

* Better monitor

* ✌️

* Add corkboard

* Add missing blend

* mousepad

* Add missing blend

* Add cube

* 額縁やモニターなどに任意の画像を表示できるように

* Update MisskeyRoom section of CONTRIBUTING.md (#5272)

* Update MisskeyRoom section of CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Refactor

* カスタムテクスチャがずれないように

* Remove debug code

* Update furnitures.json5

* 一部の家具の色を自由に変えられるように

* Update ja-JP.yml

* Type annotation

* 家具の色やテクスチャをすぐ反映するように

* Update room.vue

* Update furnitures.json5

* Add 📺

* Update ja-JP.yml

* 床の色を変えられるように

* 和室にできるように

* Update washitsu

* Use MeshLambertMaterial to improve performance

* Use MeshLambertMaterial

* Fix bug

* Refactor

* Update room.ts

* Fix washitsu

* Update room.vue

* Update washistu

* Use MeshLambertMaterial

* Update room.ts

* Set current property value

* Disable reactivity to improve performance a bit

* Fix bug

* Set current carpet color

* Update ja-JP.yml

* Add rubik-cube (#5278)

* Update ja-JP.yml (#5279)

* Update UI

* ルームの設定を追加

* Add room link

* 家具をドラッグで移動や回転できるように

* esnextにする (#5286)

* Fix moduleResolution

* Use uuid v4

* Fix bug

* マットの色を変えられるように

* ✌️

* 異方性フィルタリングするように

* グラフィックの品質をフィルタリングに反映

* Add bloom effect when ultra graphics

* Add posters

* 🎨
 2019-08-18 14:41:33 +09:00
Satsuki Yanagi
59493a0cd9 uuid() と lint (#5288) 
* Import only v4 uuid, uuid() without version is deprecated

* Add Missing semicolon
 2019-08-18 12:42:58 +09:00
MeiMei
ed8b073e54 タイトルやアイコンがきちんと設定されないことがあるのを修正 (#5265) 
* Fix: og:site_nameがbase系ページに正しく反映さんれない

* instanceNameはAPIのmetaじゃなくてog:site_nameを参照するように

* Fix: タイトルが変更されるページから通常ページに遷移してもタイトルが戻らない

* Fix: タイトルが戻らない mobile / notifications

* Fix: faviconの変更が効かないページがある
 2019-08-16 14:16:19 +09:00
syuilo
7dd193636c Fix #5260 2019-08-11 20:13:57 +09:00
MeiMei
01d018510c ユーザー名の突き抜けの修正 (#5261) 
* 突き抜け deck フォロリク/vote

* 突き抜け desktop

* notification reactionで絵文字の縦がずれないように

* Fix: ユーザーページの名前が突き抜ける

* Fix: デッキカラムでユーザー名が長いと閉じれなくなる

* デッキのカウントの位置が右になってしまってたのを修正

* デッキヘッダーのellipsis
 2019-08-11 19:48:54 +09:00
MeiMei
3b626f72e4 Resolve #5247 (#5248) 2019-08-05 10:30:31 +09:00
Oni-Men
333604898c fix #5214 ウィジェットが選択されていないときは追加されないように (#5227) 
* fix #5214

* null削除の取り消し

* 空白文字の調整
 2019-07-28 14:12:33 +09:00
syuilo
66409029e7
非ログイン時の警告処理 (#5219) 
* Update note-mixin.ts

* Update note-mixin.ts

* ✌️

* Update note-mixin.ts

* Update note-menu.vue
 2019-07-28 10:35:53 +09:00
syuilo
8ec6b2ec11 Fix error 2019-07-28 10:31:16 +09:00
Xeltica
831ca53b63 「削除して編集」機能を追加 (#5182) 
* 「削除して編集」機能を追加

* UXの調整

* 殆どの情報を保持したまま編集できるように

* update lang
 2019-07-28 05:33:12 +09:00
syuilo
c3003cb363 Improve mobile notifications view 2019-07-28 05:25:12 +09:00
syuilo
4277e53433
通知のフィルタ (#5224) 
* ✌️

* Deck
 2019-07-28 04:44:09 +09:00
Satsuki Yanagi
88f5e8e8e2 Bye moment from package.json (#5215) 
* Bye moment from package.json

* Use Mapped types for argument type definition
 2019-07-25 01:36:48 +09:00
syuilo
fd2ae6d3cf Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2019-07-24 02:17:04 +09:00
syuilo
238edd36f7 Fix error 2019-07-24 02:16:41 +09:00
MeiMei
5d847f9808 Fix: some post form errors (#5212) 
* Fix: type mismatch in post-form-attaches

* Fix: 'this is null' in post-form-window
 2019-07-24 02:15:40 +09:00
syuilo
ac914af9c3 Fix #5210 2019-07-23 00:19:29 +09:00
Satsuki Yanagi
eb8ef35122 Fix activity calendar for desktop widget (#5200) 
* Fix activity calendar for desktop widget

* fetch past 21 weeks for activity widgets

* Cleanup

* forEach -> map

* Revert "forEach -> map"

This reverts commit b72e180ee4a788ff1a3c2955a061646561b2b735.
 2019-07-21 19:12:16 +09:00
MeiMei
e695f54ef0 投稿フォームが画面外にはみ出さないように (#5203) 
* 上下はみ出したウィンドウは上基準で収めるように

* 投稿フォームを画面より長くしないように
 2019-07-20 17:50:01 +09:00
MeiMei
b2ed45ae38 Fix: スクロールしてると絵文字ピッカーの位置がずれる (#5204) 2019-07-20 17:47:40 +09:00
Satsuki Yanagi
56c8ad9df3 Improve usability of quote note by pasting url (#5196) 2019-07-20 03:23:16 +09:00
syuilo
26567cdeb2 🎨 2019-07-19 06:13:56 +09:00
syuilo
cd5b24d4eb Merge branch 'develop' 2019-07-19 03:38:05 +09:00