1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 10:07:36 +08:00
Commit Graph

6124 Commits

Author SHA1 Message Date
Joehu
1a2f5cb477 Add OnBackButton bool to OsuScreen 2020-07-13 23:59:20 -07:00
Dean Herbert
42dfc47fe3 Merge branch 'master' into legacy-background 2020-07-14 11:03:47 +09:00
Dean Herbert
f36c23928b Merge branch 'master' into legacy-background 2020-07-14 11:02:24 +09:00
Dean Herbert
ef3ab7a858 Merge branch 'master' into fix-carousel-filter-application 2020-07-13 17:05:45 +09:00
Joehu
79ea6dbd5c Only allow link clicking and tooltips of multi room drawables when selected 2020-07-12 22:24:11 -07:00
Dean Herbert
0718e9e4b6 Update outdated comment 2020-07-13 13:08:41 +09:00
Dean Herbert
ab11a112b7 Fix correct filter criteria not being applied to beatmap carousel if beatmaps take too long to load 2020-07-12 22:33:41 +09:00
Joehu
fa0c2d7f84 Fix room name overflowing on multiplayer lounge 2020-07-10 10:42:41 -07:00
Dan Balasescu
895c129151
Merge pull request #9492 from peppy/ensure-music-playing-mainmenu-lounge
Ensure music playing when returning to lounge or main menu
2020-07-10 21:23:24 +09:00
Dan Balasescu
6345af6f3b
Merge pull request #9494 from peppy/playlist-results-button
Replace large "show results" button with embedded button each playlist item
2020-07-10 20:58:12 +09:00
Dan Balasescu
be2c892c30
Merge branch 'master' into ensure-music-playing-mainmenu-lounge 2020-07-10 20:48:16 +09:00
Dean Herbert
d3367bb0f1 Remove unused public property 2020-07-10 20:32:47 +09:00
Dean Herbert
9556166c1b Replace large "show results" button with embedded button each playlist item 2020-07-10 20:19:17 +09:00
smoogipoo
fe585611e7 Fix + simplify web request 2020-07-10 19:54:09 +09:00
Dean Herbert
64e8dce1ad Highlight spotlight rooms with a different colour 2020-07-10 19:38:33 +09:00
Dean Herbert
cf3251a950 Default to showing all rooms 2020-07-10 19:38:13 +09:00
Dean Herbert
24132c7cf9 Merge branch 'master' into multiplayer-categories 2020-07-10 19:00:57 +09:00
Dean Herbert
1760cc2427 Fix behavioural regression by splitting methods out 2020-07-10 18:03:56 +09:00
smoogipoo
926279e39b Implement category dropdown for multiplayer 2020-07-10 17:26:42 +09:00
Dean Herbert
44fdb5b82e Ensure music starts when returning to lounge or main menu 2020-07-10 17:20:27 +09:00
smoogipoo
1f2689f7cb Merge branch 'master' into un-nest-overlined-display 2020-07-10 15:37:43 +09:00
smoogipoo
2ed8d42d22 Remove whitespace 2020-07-10 15:37:13 +09:00
smoogipoo
a9faa11dcb Add back playlist header 2020-07-10 15:37:08 +09:00
Dan Balasescu
14eaf75009
Merge branch 'master' into un-nest-overlined-display 2020-07-10 14:41:31 +09:00
Dean Herbert
973b6c680a
Merge branch 'master' into un-nest-overlined-display 2020-07-09 18:26:23 +09:00
Dean Herbert
115bb40816 Select via select action 2020-07-09 18:25:14 +09:00
Dean Herbert
601101147e Allow keyboard selection of rooms at the multiplayer lounge 2020-07-09 18:25:14 +09:00
Dean Herbert
80f6f87e01 Scroll selected room into view on selection 2020-07-09 17:45:29 +09:00
Dean Herbert
69062a3ed1 Remove unused search container in lounge 2020-07-09 17:43:26 +09:00
Dean Herbert
f231b5925f Add "show converted" checkbox to song select for convenience 2020-07-09 13:47:23 +09:00
Dean Herbert
bbbe8d6f68 Remove group selector for now, tidy up code somewhat 2020-07-09 13:47:11 +09:00
Dean Herbert
fd56db2156
Merge pull request #9467 from peppy/less-poo 2020-07-09 12:41:37 +09:00
Dean Herbert
efdf179906 Replace poo icon at disclaimer screen 2020-07-09 12:31:20 +09:00
Joehu
c10cf2ef49 Fix multi header title not aligning correctly when changing screens 2020-07-08 19:01:12 -07:00
Dean Herbert
35d3292200 Remove nesting of components inside overlined component
I think this makes things a bit more readable. The only weird case is
the transfer of details from the component to the `OverlinedHeader`, but
bindables make it not too bad.
2020-07-08 14:45:51 +09:00
Dean Herbert
4b4fcd39e3 Further layout adjustments based on fedback 2020-07-07 18:40:21 +09:00
Dean Herbert
4a1bea4874 Adjust layout to be two columns (and more friendly to vertical screens) 2020-07-07 18:28:43 +09:00
Dean Herbert
88b2a12c09 Reduce footer height to match back button 2020-07-07 17:38:42 +09:00
Dean Herbert
56a8b0d3f5 Merge branch 'master' into match-subscreen-redesign 2020-07-07 17:16:05 +09:00
Dean Herbert
3f3bfb1ffb Minor reshuffling / recolouring 2020-07-06 23:51:16 +09:00
Dean Herbert
a650a5ec83 Move dialog classes to own file 2020-07-06 23:44:26 +09:00
Dean Herbert
f566787988
Merge branch 'master' into custom-storage-startup-exception 2020-07-06 23:32:39 +09:00
smoogipoo
ddac511c8c Move start fresh button above 2020-07-06 22:41:51 +09:00
Dan Balasescu
8f792603ee
Apply suggestions from code review
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-07-06 22:40:45 +09:00
smoogipoo
1effe71ec2 Add dialog for storage options 2020-07-06 22:03:09 +09:00
Shivam
4ded6d1913 Change background path with resource change 2020-07-03 11:36:03 +02:00
Joehu
718f06c690 Use Mod.AdjustRank() instead 2020-07-02 12:35:32 -07:00
Shivam
e80a5a085a Make backgroundName local 2020-07-02 19:45:18 +02:00
Shivam
18e30a7fc4 Implement background switching based on the intro
Only the Welcome intro has its own unique background right now
2020-07-02 19:23:13 +02:00
Joehu
fa252d5e95 Fix score panel not showing silver s/ss badges on hd/fl plays 2020-07-01 17:37:38 -07:00