1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 21:27:54 +08:00
Commit Graph

26349 Commits

Author SHA1 Message Date
Dan Balasescu
e85c76b52d
Merge pull request #7837 from recapitalverb/remove-duplicated-load
Use Resolved attribute instead of BackgroundDependencyLoader wherever possible
2020-02-15 20:09:23 +09:00
recapitalverb
2778c6617c
Merge branch 'master' into remove-duplicated-load 2020-02-15 15:13:35 +07:00
Dan Balasescu
de6ea60ae1
Merge pull request #7844 from peppy/fix-download-button-after-cancel
Fix DownloadTrackingComposite incorrectly receiving cancelled state
2020-02-15 17:07:43 +09:00
Dean Herbert
120dab18cf Fix DownloadTrackingComposite incorrectly receiving cancelled state 2020-02-15 16:20:44 +09:00
Dean Herbert
ff3801b860
Merge pull request #7834 from smoogipoo/match-songselect-playlist-logic
Add the ability to select multiple beatmaps in multiplayer song select
2020-02-15 15:25:56 +09:00
Dean Herbert
f54844d8a5 Schedule selection update handling in MatchSubScreen to avoid firing when not the current screen 2020-02-15 15:07:10 +09:00
Dean Herbert
637c1dc840 In the case of only one playlist item, update with current selection on select 2020-02-15 14:41:16 +09:00
recapitalverb
7c9569c9a3
Merge branch 'master' into remove-duplicated-load 2020-02-15 12:10:34 +07:00
Dean Herbert
da68ae5461 Merge branch 'master' into match-songselect-playlist-logic 2020-02-15 12:27:51 +09:00
Dean Herbert
224fb36b5c
Merge pull request #7833 from smoogipoo/match-detail-area
Implement the match beatmap detail area
2020-02-15 12:24:05 +09:00
Dean Herbert
a4215106ff Merge branch 'master' into match-detail-area 2020-02-15 11:46:29 +09:00
Dean Herbert
4379466b1e
Merge pull request #7831 from peppy/improve-relax-key-down-up
Add a key up delay for relax mod presses
2020-02-15 11:42:53 +09:00
Dean Herbert
af8eda2d24
Merge pull request #7829 from smoogipoo/match-playlist
Implement a rearrangeable beatmap playlist control
2020-02-15 11:42:26 +09:00
Dan Balasescu
9c5e3942ad
Merge pull request #7836 from peppy/fix-player-loader-focused-overlay-interaction
Fix player loading sequence continuing even when a priority overlay is visible
2020-02-15 11:17:20 +09:00
Dean Herbert
0b90e732a9
Merge branch 'master' into match-playlist 2020-02-15 11:09:17 +09:00
Dean Herbert
5e8df45c00
Merge branch 'master' into improve-relax-key-down-up 2020-02-15 11:07:19 +09:00
recapitalverb
7866c26f95 Make OsuConfigManager instances readonly 2020-02-14 22:18:56 +07:00
recapitalverb
ee14a275a2 Make IAPIProvider instances nullable 2020-02-14 22:02:44 +07:00
recapitalverb
7de7748607 Remove unnecessary nullability 2020-02-14 22:02:10 +07:00
recapitalverb
2bd2cd1d3f Use OsuConfigManager from ctor instead 2020-02-14 21:59:33 +07:00
recapitalverb
c46d828716 Preserve permitNulls 2020-02-14 20:59:51 +07:00
recapitalverb
10798aeab3 Fix code formatting 2020-02-14 20:30:27 +07:00
recapitalverb
a7c2fd078f Fix remaining cases 2020-02-14 20:27:21 +07:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
smoogipoo
9eaf372587 Immediately update selected state 2020-02-14 21:17:07 +09:00
recapitalverb
6d87d22a84 Remove duplicated dependency on AudioManager 2020-02-14 18:40:58 +07:00
Dan Balasescu
851e353093
Merge branch 'master' into fix-player-loader-focused-overlay-interaction 2020-02-14 20:36:38 +09:00
Dean Herbert
73621e41fd Forcefully hide mute notification for navigation tests 2020-02-14 20:12:23 +09:00
smoogipoo
0b86825d71 Merge branch 'match-playlist' into match-songselect-playlist-logic 2020-02-14 19:57:35 +09:00
smoogipoo
f31220c1ee Fix exception when adding duplicate items 2020-02-14 19:56:43 +09:00
Dean Herbert
2fa7143cda
Merge pull request #7835 from peppy/player-loader-code-quality
Improve PlayerLoader code quality
2020-02-14 19:55:31 +09:00
Dean Herbert
14f632b532 Merge branch 'master' into match-detail-area 2020-02-14 19:54:17 +09:00
Dean Herbert
e6676ffa51 Merge branch 'match-playlist' into match-detail-area 2020-02-14 19:53:46 +09:00
Dan Balasescu
4d6e1e8b55
Merge pull request #7830 from peppy/fix-2b-relax
Fix relax mod not working correctly on beatmaps with overlapping sliders/spinners
2020-02-14 19:44:10 +09:00
Dean Herbert
e1a1403701
Merge pull request #7832 from smoogipoo/custom-detail-area
Make beatmap detail area abstract
2020-02-14 19:38:19 +09:00
Dan Balasescu
45734f8e8d
Merge branch 'master' into player-loader-code-quality 2020-02-14 19:35:40 +09:00
Dean Herbert
05c48cd929 Fix volume mute tests regressing 2020-02-14 19:27:32 +09:00
Dan Balasescu
6cd91de8f7
Merge branch 'master' into fix-2b-relax 2020-02-14 19:21:06 +09:00
Dan Balasescu
1b5a1f7f9e
Merge pull request #7828 from peppy/fix-cursor-cs-scaling
Fix osu! gameplay cursor not adjusting to mod/convert circle size changes
2020-02-14 19:20:53 +09:00
Dean Herbert
4d4ec3515d Fix player loading sequence continuing even when a priority overlay is visible 2020-02-14 19:16:08 +09:00
Dean Herbert
47325601f4 Add failing test 2020-02-14 19:16:08 +09:00
Dean Herbert
a6de5853e4
Merge branch 'master' into player-loader-code-quality 2020-02-14 18:29:54 +09:00
Dean Herbert
2808f8167d Use more regions 2020-02-14 18:28:58 +09:00
Dean Herbert
b69d1ad678 Reorder and clean up PlayerLoader 2020-02-14 18:22:57 +09:00
Dean Herbert
be30ef3cca Move BeatmapMetadataDisplay to its own class 2020-02-14 18:13:52 +09:00
Dan Balasescu
745de8ad7f
Merge branch 'master' into fix-cursor-cs-scaling 2020-02-14 18:11:18 +09:00
Dan Balasescu
dca6162d9e
Merge pull request #7807 from peppy/fix-timeline-seek-while-playing
Fix not being able to seek using scroll wheel in timeline while playing track
2020-02-14 18:07:44 +09:00
smoogipoo
fbc5ffbadb Remove now unused members 2020-02-14 17:59:47 +09:00
smoogipoo
de646649de Use test beatmap instead of beatmap manager 2020-02-14 17:59:14 +09:00
smoogipoo
32fd713a9d Use test beatmap instead of beatmap manager 2020-02-14 17:57:25 +09:00