1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 13:17:26 +08:00
Commit Graph

52299 Commits

Author SHA1 Message Date
vun
54f41ab4fa Merge branch 'colour-rework-huismet' of https://github.com/Lawtrohux/osu into colour-rework 2022-06-09 17:34:48 +08:00
vun
4c574eb044 Rescale multipliers (values unaffected) 2022-06-09 17:31:54 +08:00
Jay L
6dbaf0a030 Refactor 2022-06-09 19:22:55 +10:00
vunyunt
2e004bf551
Merge branch 'ppy:master' into colour-rework 2022-06-09 12:39:52 +08:00
vun
5793ca5534 Parameter tweaks 2022-06-09 12:35:26 +08:00
Dean Herbert
ac7b26a58f
Merge pull request #18498 from tornac1234/discord-rpc
Update Discord RPC ranking value depending on the ruleset
2022-06-09 13:14:06 +09:00
Dean Herbert
794e5434a8
Merge branch 'master' into discord-rpc 2022-06-09 12:32:47 +09:00
Dean Herbert
3799689c7d Tidy up variable naming and layout 2022-06-09 12:32:30 +09:00
Dan Balasescu
85c85f37c6
Merge pull request #18622 from jai-x/chat-timestamp-colour
Enable nullable types in `ChatLine` and update timestamp colours to match design
2022-06-09 11:39:51 +09:00
Dean Herbert
8879c59b36
Merge pull request #18623 from LittleEndu/new-me-recommender
Use new own profile statistics in difficulty recommender
2022-06-09 11:11:21 +09:00
Dan Balasescu
ace03a3c1a
Merge pull request #18620 from peppy/channel-manager-always-has-api
Ensure `ChannelManager` has access to API from point of construction
2022-06-09 11:03:13 +09:00
Endrik Tombak
c90b285861 Change variable name and inline it 2022-06-08 21:10:27 +03:00
tornac1234
eb33922417 Revert "Added user RulesetsStatistics fetching when connecting"
This reverts commit e2cdc66f6d.
2022-06-08 18:13:08 +02:00
Endrik Tombak
bf67b35ade Use new own profile statistics in difficulty recommender 2022-06-08 17:44:57 +03:00
Jai Sharma
c2ed41d097 Remove CanBeNull specification from DI attributes 2022-06-08 15:10:19 +01:00
Jai Sharma
04b434b8ce Update ChatLine timestamp and message colours 2022-06-08 14:04:01 +01:00
Jai Sharma
dfa31df2af Use #nullable enable in ChatLine 2022-06-08 14:04:01 +01:00
Dean Herbert
187086e4ec
Merge pull request #18609 from ALANVF/settings-delete-skin
Add button to delete the current skin
2022-06-08 19:18:59 +09:00
Dean Herbert
c661f2b059 Ensure ChannelManager has access to API from point of construction
Closes https://github.com/ppy/osu/issues/18451.
2022-06-08 19:15:23 +09:00
Dan Balasescu
f8594acb1d Cleanup dialog implementation 2022-06-08 18:17:43 +09:00
Dan Balasescu
4df8219c8f
Merge pull request #18618 from peppy/isolate-ui-scale-screens-better
Isolate nested sample screens from main game to avoid toolbar interactions
2022-06-08 17:59:28 +09:00
Dan Balasescu
3a90aa0b9b Fix code styling 2022-06-08 17:57:59 +09:00
Dean Herbert
5157a78ae6 Isolate nested sample screens from main game to avoid toolbar interactions 2022-06-08 16:53:06 +09:00
Dan Balasescu
c43670fcd9
Merge pull request #18603 from peppy/fix-import-dialog
Add placeholder when no results are visible at song select
2022-06-08 15:22:31 +09:00
Dean Herbert
3b46787e06
Merge pull request #18496 from smoogipoo/multiplayer-leaderboard-user-mods-2
Support mod/ruleset combinations in multiplayer gameplay leaderboard
2022-06-08 14:58:13 +09:00
vun
d8d4ac431e Refactor LocallyCombinedDifficulty to an external skill 2022-06-08 13:24:51 +08:00
Dean Herbert
eee79c9531
Merge pull request #18610 from jai-x/refactor-chat-line
Refactor `ChatLine` and fix `DrawableChannel` flow padding
2022-06-08 13:54:53 +09:00
Dean Herbert
cd649f7d97
Merge branch 'master' into multiplayer-leaderboard-user-mods-2 2022-06-08 13:39:42 +09:00
Dean Herbert
347b90c096
Merge pull request #18612 from frenzibyte/message-notifier-unresolved-channel
Fix message notifier not handling unresolved PM channels
2022-06-08 13:05:56 +09:00
Salman Ahmed
830ff66688 Fix message notifier not handling unresolved PM channels 2022-06-08 04:31:31 +03:00
Salman Ahmed
c69d53df00 Add failing test case 2022-06-08 04:29:50 +03:00
theangryepicbanana
6c05329144 Close #5820 (Ability to delete a single skin) 2022-06-07 18:01:40 -04:00
Jai Sharma
2f635fa854 Refactor ChatLine and fix DrawableChannel flow padding
Refactors `ChatLine` component to use more sensible override properties
and layout using grid container. Moves creation of username component
into its own method to simplify BDL.

Updates padding of base `DrawableChannel` flow padding.

Removes usage of `ChatOverlayDrawableChannel` since it's overrides are
no longer needed.

Updates usage of `StandAloneChatDisplay` to use new override properties
of `DrawableChannel`.
2022-06-07 22:35:45 +01:00
Bartłomiej Dach
137ad74091
Merge pull request #18602 from peppy/song-select-invalidation-reduction
Fix song select carousel invalidating every frame during global overlay dimming
2022-06-07 20:07:38 +02:00
Bartłomiej Dach
2ffbea8bfb
Merge branch 'master' into song-select-invalidation-reduction 2022-06-07 19:28:00 +02:00
Dean Herbert
228683e956 Fix nullability of dialogOverlay dependency 2022-06-07 23:48:34 +09:00
Dean Herbert
2e0b888410 Fix song select carousel invalidating every frame during global overlay dimming 2022-06-07 23:46:53 +09:00
Dean Herbert
7867ae0ceb
Merge pull request #18604 from smoogipoo/fix-taiko-masking
Fix taiko circle fills missing after rewind
2022-06-07 22:08:16 +09:00
Dan Balasescu
8578f12a58 Fix taiko circle fills missing after rewind 2022-06-07 18:35:12 +09:00
Dean Herbert
f8524c3af4 Use VisibilityContainer to avoid too many animations triggering 2022-06-07 17:25:06 +09:00
Dean Herbert
a04af1ca5f Enable nullable and add hinting at convert filter criteria 2022-06-07 17:25:06 +09:00
Dean Herbert
0d32c94104 Add initial implementation of beatmap carousel no-results-placeholder 2022-06-07 17:25:06 +09:00
Dean Herbert
df9174ec00 Remove import popup dialog from song select
This has been replaced in spirit by the first run overlay.
2022-06-07 16:45:27 +09:00
Dan Balasescu
1c7fa3d41f
Merge pull request #18601 from peppy/add-blacklisted-imports
Add blacklisted auto-import rules which conflict with osu!/osu!framework naming
2022-06-07 16:22:19 +09:00
Dean Herbert
ac5b1fba1f Add blacklisted auto-import rules which conflict with osu!/osu!framework naming 2022-06-07 15:36:26 +09:00
vun
fd49a27cf9 Fix encoding repetition, parameter adjustments 2022-06-07 13:30:24 +08:00
Dan Balasescu
476a05cafb
Merge pull request #18599 from hlysine/fix-score-panel-diff-name-overflow
Truncate difficulty name in score panel
2022-06-07 14:16:02 +09:00
Dan Balasescu
561a932d17
Merge pull request #18587 from peppy/skin-editor-fix-sizing
Fix skin editor not accounting for aspect ratios in base-game sizing logic
2022-06-07 13:19:50 +09:00
Henry Lin
ef5d601f67 Fix difficulty name overflow in score panel 2022-06-07 12:05:03 +08:00
Dean Herbert
486d740515
Merge pull request #18597 from smoogipoo/update-localisation-analyser
Update localisation analyser
2022-06-07 12:42:16 +09:00