1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 13:47:24 +08:00
Commit Graph

26315 Commits

Author SHA1 Message Date
smoogipoo
1e80facfe8 Add subscreen test scene 2020-02-14 20:03:37 +09:00
smoogipoo
b5f048ce96 Merge branch 'match-songselect-playlist-logic' into match-subscreen-redesign 2020-02-14 19:59:15 +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
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
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
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
32fd713a9d Use test beatmap instead of beatmap manager 2020-02-14 17:57:25 +09:00
smoogipoo
f0f739707f Add playlist support to match song select 2020-02-14 17:51:42 +09:00
Dean Herbert
66910f1ee3 Remove unnecessary bindable setter 2020-02-14 17:50:53 +09:00
Dean Herbert
48dcb91118 Merge branch 'master' into custom-detail-area 2020-02-14 17:40:12 +09:00
smoogipoo
5ec9f454d5 Implement the match beatmap detail area 2020-02-14 17:20:38 +09:00
smoogipoo
25e399f11b Merge branch 'match-playlist' into match-detail-area 2020-02-14 17:04:22 +09:00
Dan Balasescu
6aab9b7a08
Merge branch 'master' into fix-timeline-seek-while-playing 2020-02-14 17:02:34 +09:00
Dean Herbert
cd2d1b0669 Fix 2B maps not playing correctly with relax mod enabled 2020-02-14 17:00:55 +09:00
Dean Herbert
9ea6912520 Improve overall readability of OsuModeRelax 2020-02-14 16:58:56 +09:00
smoogipoo
aceba8791c Clean up selection handling 2020-02-14 16:56:44 +09:00
smoogipoo
6a466ea2f5 Improve test cases 2020-02-14 16:48:30 +09:00
smoogipoo
afd3e4604b Fix race condition causing selection to be reset incorrectly 2020-02-14 16:48:23 +09:00
smoogipoo
d6768bba62 Make test playlist items unique 2020-02-14 16:09:30 +09:00
smoogipoo
1909ea2bd3 Add a way to hide the drag handle 2020-02-14 16:09:19 +09:00
Dean Herbert
4fbf85505c
Merge pull request #7546 from Game4all/online-container
Add a container type to easily hide online content when not online
2020-02-14 16:00:17 +09:00
Dean Herbert
9cbb37b682 Fix bindable being created far too late in construction 2020-02-14 15:59:59 +09:00
Dean Herbert
a75715607b Move drawable load to asynchronous context 2020-02-14 15:41:46 +09:00
Dean Herbert
720ceca78a Final tidy-up pass 2020-02-14 15:38:47 +09:00
smoogipoo
5e871f9838 Make room playlist use the common rearrangeable design 2020-02-14 15:36:47 +09:00
smoogipoo
eb75d26c8f Extract common rearrangeable list design 2020-02-14 15:36:16 +09:00
Dean Herbert
edf9cfc863 API can't be null on load 2020-02-14 15:36:06 +09:00
Dean Herbert
6f1cecd86f Move LoadComplete up in method 2020-02-14 15:35:39 +09:00
Dean Herbert
7e6c194d4a Add missing xmldoc 2020-02-14 15:34:46 +09:00
Dean Herbert
4d5abab2ee Remove unnecessary content private storage 2020-02-14 15:29:50 +09:00
Dean Herbert
b86b5e9adb Move nested class to bottom of file 2020-02-14 15:27:39 +09:00
Dean Herbert
c34f1f40ea Fix test text not being centered 2020-02-14 15:27:09 +09:00
Dean Herbert
aa7efe6141 Fix tests potentially failing due to timing issues 2020-02-14 15:26:55 +09:00
Dean Herbert
76cfe1f42c Merge branch 'master' into online-container 2020-02-14 15:18:27 +09:00
smoogipoo
eb14dbcd77 Initial implementation of rearrangeable playlist 2020-02-14 15:01:45 +09:00
smoogipoo
3a0b2508d4 Fix possible nullrefs 2020-02-14 15:01:34 +09:00
Dean Herbert
0e439e3a70 Fix missing dependency in ZoomableScrollContainer test 2020-02-14 14:41:55 +09:00
Dean Herbert
884a5fbad4 Fix osu! gameplay cursor not adjusting to mod/convert circle size changes 2020-02-14 14:30:15 +09:00
Dan Balasescu
60d796ae3f
Merge branch 'master' into fix-timeline-seek-while-playing 2020-02-14 13:04:38 +09:00