Commit Graph

16807 Commits

Author SHA1 Message Date
af8eda2d24 Merge pull request #7829 from smoogipoo/match-playlist
Implement a rearrangeable beatmap playlist control
2020-02-15 11:42:26 +09:00
0b90e732a9 Merge branch 'master' into match-playlist 2020-02-15 11:09:17 +09:00
9eaf372587 Immediately update selected state 2020-02-14 21:17:07 +09:00
851e353093 Merge branch 'master' into fix-player-loader-focused-overlay-interaction 2020-02-14 20:36:38 +09:00
2fa7143cda Merge pull request #7835 from peppy/player-loader-code-quality
Improve PlayerLoader code quality
2020-02-14 19:55:31 +09:00
e1a1403701 Merge pull request #7832 from smoogipoo/custom-detail-area
Make beatmap detail area abstract
2020-02-14 19:38:19 +09:00
45734f8e8d Merge branch 'master' into player-loader-code-quality 2020-02-14 19:35:40 +09:00
4d4ec3515d Fix player loading sequence continuing even when a priority overlay is visible 2020-02-14 19:16:08 +09:00
a6de5853e4 Merge branch 'master' into player-loader-code-quality 2020-02-14 18:29:54 +09:00
2808f8167d Use more regions 2020-02-14 18:28:58 +09:00
b69d1ad678 Reorder and clean up PlayerLoader 2020-02-14 18:22:57 +09:00
be30ef3cca Move BeatmapMetadataDisplay to its own class 2020-02-14 18:13:52 +09:00
745de8ad7f Merge branch 'master' into fix-cursor-cs-scaling 2020-02-14 18:11:18 +09:00
66910f1ee3 Remove unnecessary bindable setter 2020-02-14 17:50:53 +09:00
48dcb91118 Merge branch 'master' into custom-detail-area 2020-02-14 17:40:12 +09:00
6aab9b7a08 Merge branch 'master' into fix-timeline-seek-while-playing 2020-02-14 17:02:34 +09:00
aceba8791c Clean up selection handling 2020-02-14 16:56:44 +09:00
afd3e4604b Fix race condition causing selection to be reset incorrectly 2020-02-14 16:48:23 +09:00
1909ea2bd3 Add a way to hide the drag handle 2020-02-14 16:09:19 +09:00
a75715607b Move drawable load to asynchronous context 2020-02-14 15:41:46 +09:00
720ceca78a Final tidy-up pass 2020-02-14 15:38:47 +09:00
5e871f9838 Make room playlist use the common rearrangeable design 2020-02-14 15:36:47 +09:00
eb75d26c8f Extract common rearrangeable list design 2020-02-14 15:36:16 +09:00
edf9cfc863 API can't be null on load 2020-02-14 15:36:06 +09:00
6f1cecd86f Move LoadComplete up in method 2020-02-14 15:35:39 +09:00
7e6c194d4a Add missing xmldoc 2020-02-14 15:34:46 +09:00
4d5abab2ee Remove unnecessary content private storage 2020-02-14 15:29:50 +09:00
76cfe1f42c Merge branch 'master' into online-container 2020-02-14 15:18:27 +09:00
eb14dbcd77 Initial implementation of rearrangeable playlist 2020-02-14 15:01:45 +09:00
3a0b2508d4 Fix possible nullrefs 2020-02-14 15:01:34 +09:00
0e439e3a70 Fix missing dependency in ZoomableScrollContainer test 2020-02-14 14:41:55 +09:00
884a5fbad4 Fix osu! gameplay cursor not adjusting to mod/convert circle size changes 2020-02-14 14:30:15 +09:00
60d796ae3f Merge branch 'master' into fix-timeline-seek-while-playing 2020-02-14 13:04:38 +09:00
f64f934204 Merge branch 'master' into span_fromHex 2020-02-14 12:09:34 +09:00
a9bfe9f7f3 Merge pull request #7800 from peppy/fix-editor-time-change-display
Fix editor hit objects displaying incorrectly after StartTime change
2020-02-14 11:33:42 +09:00
50899ddccb Use Span for OsuColour.FromHex 2020-02-14 03:19:25 +01:00
049b0d93d1 Add back default content fade transitions 2020-02-13 21:40:25 +01:00
dac0148c94 Apply review suggestions. 2020-02-13 20:08:14 +01:00
5b3f0bbb0a Merge branch 'master' into fix-editor-time-change-display 2020-02-13 23:55:52 +09:00
d7c71cd0c1 Merge branch 'master' into update-placement-more-often 2020-02-13 23:55:18 +09:00
e181a95c85 Remove unused using 2020-02-13 22:28:37 +09:00
4a04b434a9 Merge branch 'master' into remove-current-item 2020-02-13 21:41:23 +09:00
b9a296d3f9 Merge branch 'master' into remove-current-item 2020-02-13 19:34:15 +09:00
28ca1a5bcc Merge branch 'master' into participants-bindable 2020-02-13 19:31:50 +09:00
d633396878 Merge pull request #7816 from smoogipoo/missing-nullcheck
Add missing null-allowance to leaderboard
2020-02-13 19:30:43 +09:00
80ead1c979 Merge pull request #7813 from peppy/update-framework
Update framework
2020-02-13 19:29:59 +09:00
bc1c4f6b58 Add missing null-allowance 2020-02-13 19:04:23 +09:00
bce9c8f3f3 Make room participants into a bindable list 2020-02-13 18:59:15 +09:00
e022352812 Merge pull request #7784 from smoogipoo/fix-beatmap-disposal
Fix disposal-related errors by making WorkingBeatmap non-disposable
2020-02-13 18:52:47 +09:00
49a1725749 Merge pull request #7812 from smoogipoo/playlist-bindables
Make playlist beatmap and ruleset into bindables
2020-02-13 18:51:42 +09:00