RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 11:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,490 Commits 3 Branches 661 Tags 351 MiB
5fb51b578f
Commit Graph

49490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
5fb51b578f Update dependencies 
Mainly for a `Clowd.Squirrel` bump to fix https://github.com/ppy/osu/discussions/17190.
 2022-03-09 19:09:51 +09:00
Dean Herbert
8bb07f83cd
Merge pull request #17054 from hlysine/mod-adaptive-speed 
Implement Adaptive Speed mod
 2022-03-09 17:56:34 +09:00
Dan Balasescu
d847f5874c
Merge pull request #17188 from peppy/fix-carousel-item-interaction-when-not-visible 
Fix beatmap carousel panels accepting input while marked as not-visible
 2022-03-09 17:43:30 +09:00
Dean Herbert
520d2d6cfa Fix beatmap carousel panels accepting input while marked as not-visible 
This is an issue as carousel panels manage their own animated state. If
they are marked as not-visible (done at a higher level, from filtering
or update pathways) but clicked while fading out, they will animate back
to a visible state but not be marked as visible.

No tests for this one as it's probably not worthwhile to test (and hard
to do so). Manual testing can be done with the following patch:

```diff
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs
b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c3d340ac61..3372242acc 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -255,7 +255,7 @@ private void
beatmapSetsChanged(IRealmCollection<BeatmapSetInfo> sender, ChangeS
             }

             foreach (int i in changes.NewModifiedIndices)
-                UpdateBeatmapSet(sender[i].Detach());
+                Scheduler.AddDelayed(() =>
                 UpdateBeatmapSet(sender[i].Detach()), 100, true);

             foreach (int i in changes.InsertedIndices)
                 UpdateBeatmapSet(sender[i].Detach());

```

- Enter gameplay and adjust beatmap offset then return to song select
  and click the flashing panel.
OR
- Enter editor and save then return to song select and click the
  flashing panel.

Closes https://github.com/ppy/osu/discussions/17171.
 2022-03-09 16:08:52 +09:00
Dean Herbert
aad9e856b1
Merge pull request #17185 from smoogipoo/fix-local-score-linking 
Fix avatar not clickable after watching replay
 2022-03-09 15:39:54 +09:00
Dan Balasescu
ad0ca5673a Fix avatar not clickable after watching replay 2022-03-09 14:39:02 +09:00
Dean Herbert
affcf5180b
Merge pull request #17161 from smoogipoo/fix-listing-score-conversion 
Fix scores not being recalculated in beatmap overlay
 2022-03-09 13:32:45 +09:00
Dean Herbert
58aef25ad5
Merge pull request #17152 from bdach/mod-overlay/difficulty-multiplier 
Implement difficulty multiplier display for new mod select design
 2022-03-09 12:11:16 +09:00
Dan Balasescu
b3fd156f10
Merge pull request #17158 from peppy/realm-recover-from-newer-database-version 
Add flow to allow recovery after running an older release (with a different realm database version)
 2022-03-09 11:30:58 +09:00
Dan Balasescu
810cbd745d
Merge pull request #17170 from peppy/fix-top-local-rank-test-failures-realm-callback 
Refactor top local rank test method to be more resilient to slow realm callbacks
 2022-03-09 11:14:37 +09:00
Dan Balasescu
af4423959c
Merge pull request #17169 from peppy/fix-song-select-test-failures-realm-callback 
Refactor song select test methods to be resilient to slow realm callbacks
 2022-03-09 11:14:26 +09:00
Dan Balasescu
714789f726
Merge pull request #17167 from peppy/fix-download-button-test-failure 
Fix potential test failure on slow realm callback in `TestSceneBeatmapDownloadButton`
 2022-03-09 01:49:23 +09:00
Dan Balasescu
74fe1e8e47
Merge pull request #17166 from peppy/fix-realm-skin-dropdown-failure 
Fix potential crash on rare incorrect firing of skin dropdown update methods
 2022-03-09 01:46:31 +09:00
Dean Herbert
233c8232d3 Fix TestSceneTopLocalRank.TestHighScoreSet not waiting for potentially slow realm callback 
As brought to light by https://gist.github.com/smoogipoo/56eda7ab56b9d1966556f2ca7a80a847.
 2022-03-09 01:22:01 +09:00
Dean Herbert
286bafe326 Refactor multiple TestScenePlaySongSelect test methods to be resilient to slow realm callbacks 2022-03-09 01:18:53 +09:00
Dean Herbert
821de83e54
Merge pull request #17165 from smoogipoo/fix-intermittent-test 
Fix intermittent multiplayer ready button test failures
 2022-03-09 01:16:38 +09:00
Dean Herbert
56ad684f5b Fix potential test failure on slow realm callback in TestSceneBeatmapDownloadButton 
As brought to light by https://gist.github.com/smoogipoo/56eda7ab56b9d1966556f2ca7a80a847.
 2022-03-09 01:11:46 +09:00
Dean Herbert
a2ef086c1f Fix potential crash on rare incorrect firing of skin dropdown update methods 
As brought to light by https://gist.github.com/smoogipoo/56eda7ab56b9d1966556f2ca7a80a847.

There's a chance that the dropdown is not populated by the time
`updateSelectedSkinFromConfig` is fired via an external means (config
changes).
 2022-03-09 01:08:13 +09:00
Dan Balasescu
729af28a64 Fix intermittent test failure 2022-03-09 00:48:12 +09:00
Dan Balasescu
94d5e2f264 Fix test failure ripple through entire TestScene 2022-03-09 00:48:03 +09:00
Dan Balasescu
e9a2d23542 Fix score order related test failure 2022-03-08 23:35:35 +09:00
Dan Balasescu
a352a140bc
Merge pull request #17157 from peppy/fix-statistics-json-serialisation 
Fix incorrect serialisation of submitted scores
 2022-03-08 20:20:31 +09:00
Dan Balasescu
d13a66a96c Rework test scene by only relying on OnlineID 2022-03-08 20:11:56 +09:00
Dan Balasescu
4603e082f5
Merge pull request #17160 from peppy/remove-unnecessary-user-submittable-score 
Remove `user` from `SubmittableScore`
 2022-03-08 19:34:47 +09:00
Dan Balasescu
f5cd967635 Fix scores not being recalculated in beatmap listing 2022-03-08 19:07:39 +09:00
Dean Herbert
e0dc3a04f3
Merge pull request #17159 from smoogipoo/add-hitresult-helper 
Add IsBasic() and IsTick() extensions on HitResult
 2022-03-08 18:46:39 +09:00
Dean Herbert
b0f40d9e45 Remove user from SubmittableScore 
This wasn't being used by osu-web, and included far too much unnecessary
data. Of note, `pp` and `ruleset_id` are also not strictly required, but
there's no harm in sending them so I've left them be for now.
 2022-03-08 18:38:24 +09:00
Dean Herbert
6565c95b17 Remove unused variable 2022-03-08 18:19:54 +09:00
Dan Balasescu
a172fc6cb8 Add IsBasic() and IsTick() extensions on HitResult 2022-03-08 18:19:12 +09:00
Dean Herbert
0718a55ad0 Add flow to allow recovery after running an older release (with a different realm database version) 
As brought up in https://github.com/ppy/osu/discussions/17148
 2022-03-08 18:15:28 +09:00
Dean Herbert
9a347af5c7 Add test coverage of SubmittableScore serialisation to (roughly) match spec 2022-03-08 17:58:52 +09:00
Dean Herbert
589a40ca2d Add EnumMember naming to HitResult to allow for correct json serialisation 2022-03-08 17:58:37 +09:00
Dan Balasescu
719331420c
Merge pull request #17155 from peppy/beatmap-leaderboard-dont-handle-offset-changes 
Fix `BeatmapLeaderboard` refreshing on changes in local offset setting
 2022-03-08 15:38:05 +09:00
Dean Herbert
622ec53130 Fix BeatmapLeaderboard refreshing on unrelated changes to a beatmap 2022-03-08 14:50:47 +09:00
Dean Herbert
2a55c5e02e Add extension method to detect and isolate realm collection-level changes 2022-03-08 14:50:47 +09:00
Bartłomiej Dach
643f68e844
Better annotate initial rolling counter value set 2022-03-07 23:11:20 +01:00
Bartłomiej Dach
019f4d965d
Show two decimal digits on mod multiplier rather than one 2022-03-07 22:55:55 +01:00
Bartłomiej Dach
c25d7a1c75
Use rolling counter for multiplier display 2022-03-07 22:50:51 +01:00
Bartłomiej Dach
78a3b5961e
Implement basic difficulty multiplier display 2022-03-07 22:50:51 +01:00
Dan Balasescu
e0d2c8ca5e
Merge pull request #17046 from peppy/clowd-squirrel 
Replace squirrel fork with `Clowd.Squirrel`
 2022-03-07 16:25:40 +09:00
Dan Balasescu
51f6eb4028
Merge pull request #17075 from peppy/realm-property-watching 
Add ability to watch properties via a `RealmAccess` helper method
 2022-03-07 14:38:23 +09:00
Dean Herbert
31d6c75f40 Merge branch 'master' into realm-property-watching 2022-03-07 13:53:17 +09:00
Dan Balasescu
b90a5864b1
Merge pull request #17138 from peppy/disallow-icon-interaction 
Disallow interaction with carousel set difficulty icons unless selected
 2022-03-07 13:00:18 +09:00
Dean Herbert
da29947ecd Disallow interaction with carousel set difficulty icons unless selected 
I kinda liked this flow, but from multiple reports from users it
definitely seems in the way. We can revisit after the new design is
applied to song select.

Note that this means the tooltips also don't display. If it is preferred
that they should (arguable from a UX perspective, since I'd expect to be
able to click at that point) then the issue can be addressed using a
slightly different path (a few more lines - nothing too complex).
 2022-03-07 11:34:08 +09:00
Dean Herbert
bd1adaf245
Merge pull request #17115 from frenzibyte/manual-channel-scroll 
Refactor channel scrolling container to handle non-user scrolls
 2022-03-07 11:26:23 +09:00
Dan Balasescu
ba83db0229
Merge pull request #17134 from bdach/mod-overlay/popup-screen-title 
Implement popup screen title component
 2022-03-07 11:03:38 +09:00
Dean Herbert
3e73b8c78a
Merge pull request #17059 from frenzibyte/fix-storyboard-sample-rate 
Fix storyboard samples rate not adjusted from actual gameplay mods
 2022-03-07 09:41:06 +09:00
Salman Ahmed
e5a6564034
Merge branch 'master' into fix-storyboard-sample-rate 2022-03-07 03:12:40 +03:00
Salman Ahmed
d9be65ea39 Remove no longer necessary CancelUserScroll method 2022-03-06 23:58:06 +03:00
Salman Ahmed
60334046e4 Revert UserTrackingScrollContainer changes 2022-03-06 23:57:51 +03:00