Commit graph

31 commits

Author SHA1 Message Date
mattyatea 2b52a215e5 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/backend/src/core/QueueService.ts
#	packages/frontend/src/components/global/MkPageHeader.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/clicker.vue
#	packages/frontend/src/pages/my-lists/index.vue
#	packages/frontend/src/pages/notifications.vue
#	packages/frontend/src/pages/settings/emoji-picker.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/universal.vue
#	pnpm-lock.yaml
2024-02-16 19:40:51 +09:00
taiy 860e8bb5d8
fix(frontend/pageMetadata): ページタイトルが更新されない問題 (#13289)
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-16 16:17:09 +09:00
tamaina c1514ce91d (re) update SPDX-FileCopyrightText
Fix  #13290
2024-02-13 15:59:27 +00:00
tamaina 311c2172d7 Revert "update SPDX-FileCopyrightText"
This reverts commit 9b5aeb76d8.
2024-02-13 15:50:11 +00:00
mattyatea 5812b15cbd Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/backend/src/core/QueueService.ts
#	packages/frontend/src/components/global/MkFooterSpacer.vue
2024-02-13 05:48:07 +09:00
syuilo 9b5aeb76d8 update SPDX-FileCopyrightText 2024-02-12 11:37:45 +09:00
mattyatea dfd491ff85 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/pages/settings/theme.vue
2024-02-09 10:14:24 +09:00
かっこかり 500ea793b3
fix(bubble-game): 共有用画像のコメントにnullが入る問題を修正 (#13183) 2024-02-06 19:24:52 +09:00
mattyatea f6d3fde92d Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/models/RepositoryModule.ts
#	packages/backend/src/models/_.ts
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkUserSelectDialog.vue
#	packages/frontend/src/components/index.ts
#	packages/frontend/src/os.ts
#	packages/frontend/src/pages/avatar-decorations.vue
#	packages/frontend/src/pages/settings/mute-block.word-mute.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/misskey-bubble-game/src/monos.ts
2024-01-20 14:54:06 +09:00
syuilo 952386ba8f refactor: extract bubble-game engine as independent package 2024-01-20 09:53:26 +09:00
mattyatea 04ed64b19b Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/pages/drop-and-fusion.game.vue
#	packages/frontend/src/pages/drop-and-fusion.vue
#	packages/frontend/src/scripts/drop-and-fusion-engine.ts
2024-01-17 20:22:58 +09:00
syuilo 945d6a2b09 enhance(drop-and-fusion): ゲームバランスの調整など 2024-01-17 20:11:32 +09:00
mattyatea 5cfa86e85e Feat: drop-and-fusion update 2024-01-17 06:57:32 +09:00
syuilo 27dc0d3530 enhance(drop-and-fusion): sweets mode 2024-01-14 12:59:58 +09:00
syuilo 4846ab077b enhance(drop-and-fusion): refactor and new mode(wip) 2024-01-13 18:03:31 +09:00
syuilo c26c01c7a0 fix type 2024-01-13 17:06:41 +09:00
syuilo 18a5e377f4 tweak 2024-01-13 15:45:23 +09:00
syuilo d246f6c360 enhance(drop-and-fusion): some tweaks 2024-01-13 14:57:06 +09:00
syuilo 5503ad9d1a clean up 2024-01-13 12:01:18 +09:00
syuilo 7b0f5b50fc refactor(drop-and-fusion): some refactors 2024-01-13 12:00:12 +09:00
syuilo 6177fcb2f5 perf(drop-and-fusion): remove root Transition component for improve performance 2024-01-13 11:49:47 +09:00
syuilo c33f56e3ed refactor(drop-and-fusion): レンダリングや効果音に関する関心をエンジンから分離 2024-01-13 11:43:13 +09:00
syuilo b13410df02 enhance(drop-and-fusion): some tweaks 2024-01-13 09:08:44 +09:00
syuilo 87ffc672dd enhance(drop-and-fusion): yenモードで生涯で稼いだ額を記録するように 2024-01-12 21:01:38 +09:00
syuilo 0aefebf02a enhance(drop-and-fusion): some tweaks 2024-01-12 20:38:04 +09:00
syuilo 271407312e chore(drop-and-fusion): tweak sounds 2024-01-12 17:55:27 +09:00
syuilo c2a9a7b69e enhance(drop-and-fusion): tweak sounds 2024-01-12 17:34:24 +09:00
syuilo d2063df78d enhance(drop-and-fusion): add new mode, some tweaks 2024-01-12 14:48:44 +09:00
syuilo cf54c2ba47 feat: ranking system of bubble game
Resolve #12961
2024-01-11 18:13:39 +09:00
syuilo 762fa6a8d8 enhance(drop-and-fusion): make game engine headless for server-side running 2024-01-11 12:34:03 +09:00
syuilo 36fd7d17cf enhance(drop-and-fusion): some tweaks 2024-01-10 19:54:59 +09:00