1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 16:07:25 +08:00
Commit Graph

2481 Commits

Author SHA1 Message Date
Dean Herbert
19d61c1255 Merge branch 'master' into match-subscreen-redesign 2020-02-15 15:29:33 +09:00
Dean Herbert
da68ae5461 Merge branch 'master' into match-songselect-playlist-logic 2020-02-15 12:27:51 +09:00
Dean Herbert
a4215106ff Merge branch 'master' into match-detail-area 2020-02-15 11:46:29 +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
Dean Herbert
0b90e732a9
Merge branch 'master' into match-playlist 2020-02-15 11:09:17 +09:00
smoogipoo
61d539dc67 Fix first playlist item not getting selected 2020-02-14 23:39:39 +09:00
smoogipoo
b92f1ad68d Implement match subscreen re-design 2020-02-14 20:48:09 +09:00
smoogipoo
b762e5e8a5 Implement overlined components 2020-02-14 20:42:14 +09:00
smoogipoo
929eb4f035 Add match footer 2020-02-14 20:35:52 +09:00
smoogipoo
d5496321e2 Implement leaderboard chat display 2020-02-14 20:31:55 +09:00
smoogipoo
c75a774297 Extract participants list from the room inspector 2020-02-14 20:27:37 +09:00
smoogipoo
c0dba63278 Remove match info 2020-02-14 20:14:25 +09:00
Dean Herbert
73621e41fd Forcefully hide mute notification for navigation tests 2020-02-14 20:12:23 +09:00
smoogipoo
b0793b06ed Re-implement the match header 2020-02-14 20:10:36 +09:00
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
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
Dean Herbert
05c48cd929 Fix volume mute tests regressing 2020-02-14 19:27:32 +09:00
Dean Herbert
47325601f4 Add failing test 2020-02-14 19:16:08 +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
smoogipoo
f0f739707f Add playlist support to match song select 2020-02-14 17:51:42 +09:00
smoogipoo
5ec9f454d5 Implement the match beatmap detail area 2020-02-14 17:20:38 +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
d6768bba62 Make test playlist items unique 2020-02-14 16:09:30 +09:00
smoogipoo
5e871f9838 Make room playlist use the common rearrangeable design 2020-02-14 15:36:47 +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
Lucas A
049b0d93d1 Add back default content fade transitions 2020-02-13 21:40:25 +01:00
Lucas A
dac0148c94 Apply review suggestions. 2020-02-13 20:08:14 +01:00
Dean Herbert
4a04b434a9
Merge branch 'master' into remove-current-item 2020-02-13 21:41:23 +09:00
Dean Herbert
b9a296d3f9
Merge branch 'master' into remove-current-item 2020-02-13 19:34:15 +09:00
Dean Herbert
28ca1a5bcc
Merge branch 'master' into participants-bindable 2020-02-13 19:31:50 +09:00
smoogipoo
bce9c8f3f3 Make room participants into a bindable list 2020-02-13 18:59:15 +09:00
Dean Herbert
49a1725749
Merge pull request #7812 from smoogipoo/playlist-bindables
Make playlist beatmap and ruleset into bindables
2020-02-13 18:51:42 +09:00
smoogipoo
75bef15583 Remove "current" multiplayer room item 2020-02-13 18:48:28 +09:00
smoogipoo
91edadfe9d Make playlist beatmap and ruleset into bindables 2020-02-13 18:12:47 +09:00
smoogipoo
d4f14e552a Improve extensibility of mod display expansion 2020-02-13 18:05:53 +09:00
Dean Herbert
6a2b3c5c02
Merge pull request #7733 from EVAST9919/rankings-overlay-spotlights
Add spotlight selector to RankingsOverlay
2020-02-13 13:14:02 +09:00
Dan Balasescu
9a9349a13a
Merge branch 'master' into adjust-beatmap-overlay 2020-02-12 16:52:42 +09:00
Tree
b694b0c90c
Merge branch 'master' into adjust-beatmap-overlay 2020-02-11 21:07:26 +01:00
Lucas A
b9e10cb498 Privatize ViewTarget 2020-02-11 18:10:46 +01:00