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

69320 Commits

Author SHA1 Message Date
Dan Balasescu
d54c6aefbe
Merge branch 'master' into pp_refactoring_osustrainskill 2024-09-12 17:28:24 +09:00
Dan Balasescu
1beae4b71a
Merge pull request #29293 from Givikap120/pp_refactoring_merge_multipliers
Pp Refactoring: Merged multipliers that do the same thing
2024-09-12 17:22:23 +09:00
Dan Balasescu
c7a2e79b6e
Merge branch 'master' into pp_refactoring_merge_multipliers 2024-09-12 16:22:55 +09:00
Dean Herbert
e16769f4c9
Merge pull request #29848 from peppy/update-framework
Update framework
2024-09-12 15:46:09 +09:00
Dean Herbert
77c3cb6504
Update framework 2024-09-12 14:38:51 +09:00
Dean Herbert
a8365202d9
Merge pull request #29841 from bdach/replay-analysis-mod-woes
Fix several issues in interactions between playfield-altering mods and the replay analysis feature
2024-09-12 13:52:09 +09:00
Dan Balasescu
91fc476b0e
Merge pull request #29294 from Givikap120/pp_refactoring_speed_eval_change
Pp Refactoring: `SpeedEvaluator` refactoring
2024-09-12 00:25:10 +09:00
Dan Balasescu
d935ed949c
Merge branch 'master' into pp_refactoring_speed_eval_change 2024-09-11 23:45:10 +09:00
Bartłomiej Dach
f38ae5f239
Fix replay analysis overlay being affected by visibility impairing mods
Closes https://github.com/ppy/osu/issues/29748.
2024-09-11 15:55:02 +02:00
Bartłomiej Dach
4a39873e2a
Fix replay analysis overlay not rotating with Barrel Roll enabled
Closes https://github.com/ppy/osu/issues/29839.
2024-09-11 15:54:30 +02:00
Bartłomiej Dach
b78ef81bf1
Fix Flashlight not appearing on top of bubbles from Bubbles mod
Inadvertently regressed in 44d0dc6113.
2024-09-11 15:54:07 +02:00
Dean Herbert
b5afca98f1
Merge pull request #29838 from bdach/do-not-use-abstract-do-NOT-use-abstract-DO-NOT-USE-ABSTRACT
Remove poorly-fitted "legacy combo counter" abstraction
2024-09-11 20:13:00 +09:00
Bartłomiej Dach
0e663d1801
Revert default combo counter code to pre-abstractification (and nuke eldritch abstract entity) 2024-09-11 11:44:59 +02:00
Bartłomiej Dach
d8a745ec04
Decouple legacy mania combo counter from abstract eldritch entity 2024-09-11 11:44:57 +02:00
Dan Balasescu
fd887b24fa
Merge pull request #29805 from smallketchup82/complete-disable-velopack
Completely disable Velopack when using an external updater
2024-09-11 16:27:24 +09:00
Dean Herbert
02f8f226f8
Merge pull request #29787 from peppy/fix-restart-notifications
Fix restart notifications appearing every 30 minutes in some cases
2024-09-11 02:59:59 +09:00
Dean Herbert
1037fbb305
Merge pull request #29822 from smallketchup82/differentiate-lazer-in-menus
Differentiate lazer in windows menus
2024-09-10 21:14:26 +09:00
smallketchup82
f716cb4a7c
Change to using osu!(lazer) 2024-09-09 16:11:28 -04:00
smallketchup82
4ada0bf787
Differentiate lazer in menus 2024-09-09 12:49:36 -04:00
Dean Herbert
63b6f36a29
Add missing . 2024-09-09 18:09:28 +09:00
smallketchup82
d451415d5c
Move environment variable logic to static bool in OsuGameDesktop 2024-09-09 03:28:50 -04:00
smallketchup82
4ff72c5331
Add beatmap icon to windows beatmap files 2024-09-09 03:04:16 -04:00
smallketchup82
bf3597f711
Merge branch 'master' into complete-disable-velopack 2024-09-08 21:33:50 -04:00
Dean Herbert
19e4cc84d5
Also schedule a re-check on download failure 2024-09-09 01:58:09 +09:00
Bartłomiej Dach
f0e2b803de
Merge pull request #29766 from SchiavoAnto/29761-fix-blocked-info
Fix timing points being blocked by buttons in the editor
2024-09-08 18:37:59 +02:00
Dean Herbert
e836062b21
Merge pull request #29786 from bdach/fix-difficulty-sort-selection-change
Fix selection being dropped when changing carousel sort mode from difficulty sort
2024-09-09 00:45:33 +09:00
Bartłomiej Dach
7ec2e0e866
Refactor layout code to be a bit less haphazard
Visually the same, functionally much saner.
2024-09-08 16:30:09 +02:00
Bartłomiej Dach
f5c5614eef
Resolve existing colour provider instead of re-caching own one 2024-09-08 16:29:53 +02:00
Dean Herbert
10e84d72e5
Fix restart notifications appearing every 30 minutes
If a user was to manually check for updates via the button, the recheck
would have been fired. This is a recent regression.

I kinda want to reorganise this code (the button press for check for
udpates shouldn't even get close to the recheck code IMO) but for now
this seems like one we should quickly fix.

Addresses https://github.com/ppy/osu/discussions/29774.
2024-09-08 23:13:17 +09:00
Bartłomiej Dach
cefbc76490
Fix selection being dropped when changing carousel sort mode from difficulty sort
Closes https://github.com/ppy/osu/issues/29738.

This "regressed" in https://github.com/ppy/osu/pull/29639, but if I
didn't know better, I'd go as far as saying that this looks like a .NET
bug, because the fact that PR broke it looks not sane.

The TL;DR on this is that before the pull in question, the offending
`.Contains()` check that this commit modifies was called on a
`List<BeatmapSetInfo>`. The pull changed the collection type to
`BeatmapSetInfo[]`. That said, the call is a LINQ call, so all good,
right?

Not really. First off, the default overload resolution order means that
the previous code would call `List<T>.Contains()`, and not
`Enumerable.Contains<T>()`. Then again, why would that matter? In both
cases `T` is still `BeatmapSetInfo`, right? Well... about that...

It is difficult to tell for sure what precisely is happening here,
because of what looks like runtime magic. The end *symptom* is that the
old code ended up calling `Array<BeatmapSetInfo>.IndexOf()`, and the new
code ends up calling... `Array<object>.IndexOf()`.

So while yes, `BeatmapSetInfo` implements `IEquatable` and
the expectation would be that `Equals<BeatmapSetInfo>()` should be
getting called, the type elision to `object` means that we're back to
reference equality semantics, because that's what
`EqualityComparer.Default<object>` is.

A five-minute github search across dotnet/runtime yields this:

	c4792a228e/src/coreclr/vm/array.cpp (L984-L990)

Now again, if I didn't know better, I'd see that "OPTIMIZATION:"
comment, see what transpired in this scenario, and call that
optimisation invalid, because it changes semantics. But I *probably*
know that the dotnet team knows better and am probably just going to
take it for what it is, because blame on that code looks to be years
old and it's probably not a new behaviour. (I haven't tested empirically
if it is.)

Instead the fix is just to tell the `.Contains()` method to use the
correct comparer.
2024-09-08 16:06:35 +02:00
Bartłomiej Dach
134bcc85b7
Add failing test case 2024-09-08 16:06:35 +02:00
schiavoanto
2e6f17f253 Fixed wrong OverlayColourScheme 2024-09-08 16:04:10 +02:00
schiavoanto
cf23c6668c Added background color to hide beatmap background 2024-09-08 15:59:23 +02:00
Dean Herbert
4a6266efcf
Merge pull request #29714 from Crystallized21/total-participation-tooltip
Add Total Participation stat to users profile Daily Challenge Tooltip
2024-09-08 22:42:02 +09:00
Bartłomiej Dach
7f814d3106
Fix incorrect tiers being used for tooltip total participation display
Compare: 95e4561a54
2024-09-08 14:26:50 +02:00
Bartłomiej Dach
139fc07a09
Merge pull request #29770 from Ianlucht/Add-Animation-to-challenge-notification
Add daily challenge animation to daily challenge notification
2024-09-08 13:13:59 +02:00
smallketchup82
4cf057db8f
Completely disable velopack when using external update manager 2024-09-08 01:17:18 -04:00
Ianlucht
cd94d6e2bc fixed if statement format 2024-09-07 14:01:38 -06:00
Ianlucht
e6f81abc3b cleaned up whitespace 2024-09-07 13:57:12 -06:00
Ianlucht
170737b68f added DailyChallengeIntro to notification 2024-09-07 13:48:14 -06:00
Ianlucht
958bfde51d added DailyChallengeIntro to notification 2024-09-07 13:46:42 -06:00
schiavoanto
2bc6547d49 Code quality fix: added type 2024-09-07 16:23:23 +02:00
schiavoanto
32de8e9b2d Fixed ControlPointTable items being blocked by buttons 2024-09-07 16:15:00 +02:00
Dean Herbert
e88083adc1
Merge pull request #29762 from peppy/fix-beatmap-difficulty-splitting
Fix beatmap difficulties not being split out on first load
2024-09-07 23:12:37 +09:00
Dean Herbert
4c6eb89530
Fix beatmap difficulties not being split out on first load
Closes https://github.com/ppy/osu/issues/29728.
2024-09-07 22:14:03 +09:00
Dean Herbert
3e3ee3757c
Add failing test case for difficulty splitting 2024-09-07 22:14:02 +09:00
Dean Herbert
7f687d545d
Merge pull request #29715 from bdach/fix-stall-on-empty-replay-import-attempt
Fix stall when attempting to import replay after hitting nothing
2024-09-07 22:01:31 +09:00
Dean Herbert
10ef5a6d6d
Update framework 2024-09-07 21:46:43 +09:00
Dean Herbert
f3a07654d1
Merge pull request #29743 from smallketchup82/fix-file-associations
Fix file associations not updating or uninstalling
2024-09-07 21:23:51 +09:00
Dan Balasescu
02eb6835e3
Merge pull request #29745 from Ianlucht/fix-beatmap-artist-and-title-search-to-include-double-quotes-resolves#29708
Double-quote in beatmap listing when searching by artist/title
2024-09-07 18:42:27 +09:00