1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:38:33 +08:00
Commit Graph

35989 Commits

Author SHA1 Message Date
Bartłomiej Dach
7651d4554a
Merge branch 'master' into fix-transform-carousel 2021-01-06 13:49:05 +01:00
Bartłomiej Dach
43b9fde457 Add some nullability annotations for good measure 2021-01-06 13:15:15 +01:00
Dean Herbert
99701a6d9b Add null check on beatmapContainer for safety 2021-01-06 21:06:33 +09:00
Dean Herbert
ffafdf2209 Merge branch 'master' into fix-transform-carousel 2021-01-06 21:03:22 +09:00
Dean Herbert
ddfa3254b3
Merge pull request #11425 from peppy/fix-transform-mutation-from-background
Fix transform mutation on background screens
2021-01-06 20:01:42 +09:00
Bartłomiej Dach
25b4628672
Merge branch 'master' into fix-transform-mutation-from-background 2021-01-06 11:04:51 +01:00
Bartłomiej Dach
04cdbc9a03
Merge pull request #11428 from peppy/fix-transform-mutation-display-settings 2021-01-06 10:46:07 +01:00
Dean Herbert
07cff70387 Add specific messaging for when there's no background stack available 2021-01-06 18:19:03 +09:00
Bartłomiej Dach
6572bb18de
Merge branch 'master' into fix-transform-mutation-display-settings 2021-01-06 10:09:14 +01:00
Dean Herbert
550ef3f133 Aggressively dispose ownedBackground if it was not used, because we can 2021-01-06 15:28:01 +09:00
Dean Herbert
e9d4e4d1d5 Add xmldoc and throw a local exception on null background 2021-01-06 15:26:44 +09:00
Dean Herbert
11a0c637bc Mark background properties as nullable 2021-01-06 15:26:00 +09:00
Dean Herbert
15dd7a87a6 Move gameplay preview event binding to LoadComplete 2021-01-06 15:19:12 +09:00
Bartłomiej Dach
1f0af747ad
Merge pull request #11426 from peppy/fix-transform-mutation-loading-layer 2021-01-05 23:45:17 +01:00
Bartłomiej Dach
52687fc37c Merge branch 'master' into fix-transform-mutation-loading-layer 2021-01-05 23:10:51 +01:00
Bartłomiej Dach
0880e76da8 Mark background dim layer as possibly-null 2021-01-05 22:56:53 +01:00
Bartłomiej Dach
ac1d6d4444 Make auto-property get-only 2021-01-05 22:56:53 +01:00
Bartłomiej Dach
2b253f6d01 Remove now-unused fields & locals 2021-01-05 22:56:53 +01:00
Bartłomiej Dach
e9282e9a2b
Merge pull request #11405 from peppy/fix-carousel-centering-on-window-resize 2021-01-05 22:03:40 +01:00
Bartłomiej Dach
fbbc26d7d8
Merge branch 'master' into fix-carousel-centering-on-window-resize 2021-01-05 21:30:39 +01:00
Bartłomiej Dach
11e228b781
Merge pull request #11419 from peppy/fix-transform-mutation-from-disposal-thread
Fix RemoveBlockingOverlay causing transform mutation from disposal threads
2021-01-05 20:45:32 +01:00
Bartłomiej Dach
847d2d8deb
Merge branch 'master' into fix-transform-mutation-from-disposal-thread 2021-01-05 19:52:10 +01:00
Dean Herbert
4b539b01c1 Match code between updateSelectedBeatmap/Ruleset 2021-01-05 20:38:58 +09:00
Dean Herbert
83dbba3cbf Fix carousel beatmap set panels applying transforms to difficulties while they are loading 2021-01-05 18:41:45 +09:00
Dean Herbert
d0d2e41b28 Fix display settings binding to configuration bindables in async load 2021-01-05 18:19:28 +09:00
Dean Herbert
0639429a23 Fix test (and remove no longer valid test) 2021-01-05 18:10:39 +09:00
Dean Herbert
3b98782964
Merge pull request #11420 from kyekiller/master
Fix to toolbar tooltips
2021-01-05 17:43:32 +09:00
Dean Herbert
0b1ee2e267 Remove unused dispose logic 2021-01-05 17:42:19 +09:00
Dean Herbert
54982dcdd7 Refactor LoadingLayer to avoid applying effects to external drawables
In theory this seemed like a good idea (and an optimisation in some
cases, due to lower fill rate), but in practice this leads to weird edge
cases.

This aims to do away with the operations on external drawables by
applying a dim to the area behind the `LoadingLayer` when required.
I went over each usage and ensured they look as good or better than
previously.

The specific bad usage here was the restoration of the colour on dispose
(if the `LoadingLayer` was disposed in a still-visible state).

I'm aware that the `BeatmapListingOverlay` will now dim completely during
load. I think this is fine for the time being.
2021-01-05 17:31:45 +09:00
Dean Herbert
5d8c153c1e Move schedule logic to buttons rather than section
It turns out there's some quite convoluted scheduling / order of
execution requirements of ModSelectOverlay and ModSection. Applying
scheduling causes a runaway condition ending in zero frames after many
mod button changes.

I wanted to avoid rewriting the whole component, so have just moved the
schedule to guard against the part where drawables are actually changed.
2021-01-05 16:41:05 +09:00
Dean Herbert
4d6c13f169 Privatise ModSelectOverlay methods that may be unsafe to be called externally 2021-01-05 16:18:13 +09:00
Dean Herbert
9bac791a57 Fix deselection of autoplay mod failing 2021-01-05 16:17:58 +09:00
Dean Herbert
57a8cd7461 Schedule deselection operations for safety 2021-01-05 16:17:58 +09:00
Dean Herbert
5904e426eb Remove unused variable 2021-01-05 16:00:25 +09:00
Dean Herbert
60fc60fa00
Merge pull request #11415 from frenzibyte/fix-ready-button-crash
Fix multiplayer ready button crashing when deleting selected beatmap set
2021-01-05 15:58:09 +09:00
Dean Herbert
b3f08b29ca Ensure that all changes to screen backgrounds are on the correct thread 2021-01-05 15:22:50 +09:00
Dean Herbert
a3e4e2f6c3 Switch ResultsScreen and SongSelect inheritance and remove local implementation 2021-01-05 15:22:50 +09:00
Dean Herbert
962c95dc01 Fix ModSelection making unsafe advances of ModSection 2021-01-05 15:19:37 +09:00
Dean Herbert
ed6ffe2ef1 Remove hacky code 2021-01-05 14:54:59 +09:00
Dean Herbert
31a6e9b860 Remove unused using 2021-01-05 14:24:49 +09:00
Dean Herbert
afab35a31a Fix missing copy implementation in LegacySampleControlPiont 2021-01-05 13:41:31 +09:00
Dean Herbert
6b8e1913ee Fix dependency not always available due to nested LoadComponentAsync call 2021-01-05 13:27:45 +09:00
Dean Herbert
385c9cd2e2 Add test coverage 2021-01-05 13:14:16 +09:00
Dean Herbert
caa88c6100 Use CreateCopy instead of Clone interface
I was going for conformity by using the IClonable interface, but it
doesn't look like we use it anywhere else in the project.
2021-01-05 13:13:52 +09:00
Salman Ahmed
81355652fa Add simple test coverage 2021-01-05 06:00:15 +03:00
KyeKiller
77e660e426 Should pass all checks again now. 2021-01-04 22:11:52 +00:00
KyeKiller
1234d0fa04 Applied all tooltips to the right 2021-01-04 22:01:12 +00:00
kyekiller
254698d9a2
Merge branch 'master' into master 2021-01-04 21:07:12 +00:00
KyeKiller
0e42d415c1 Hit another oopie 2021-01-04 21:05:28 +00:00
KyeKiller
3468df840b Moved tooltip to the left to stop the overflow 2021-01-04 21:04:30 +00:00