1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 23:13:34 +08:00
Commit Graph

18911 Commits

Author SHA1 Message Date
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
Dan Balasescu
e6a759334d
Merge pull request #9476 from peppy/lounge-scroll-selected-into-view
Scroll selected room into view on selection
2020-07-10 10:45:16 +09:00
Dan Balasescu
58de7a2e74
Merge branch 'master' into multiplayer-test-simplify 2020-07-10 09:58:58 +09:00
Dean Herbert
43624381bf Change multiplayer tests to have null room by default 2020-07-09 18:55:53 +09:00
Dean Herbert
973b6c680a
Merge branch 'master' into un-nest-overlined-display 2020-07-09 18:26:23 +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
f5e79d1bf3
Merge branch 'master' into opaque-toolbar 2020-07-09 16:04:50 +09:00
smoogipoo
7d59825851 Update framework 2020-07-09 15:16:40 +09:00
Dean Herbert
fce9eaaff9
Merge pull request #9470 from smoogipoo/dispose-task-scheduler 2020-07-09 15:14:27 +09:00
Dan Balasescu
fcf3d1ca89
Merge branch 'master' into opaque-toolbar 2020-07-09 15:00:17 +09:00
smoogipoo
04ce436f6a Dispose beatmap lookup task scheduler 2020-07-09 14:46:58 +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
Dan Balasescu
dcc2958e14
Merge branch 'master' into news 2020-07-08 17:16:16 +09:00
Dean Herbert
6c8b6f05f8 Fix key bindings switching order at random on consecutive "reset to defaults" 2020-07-08 15:24:26 +09:00
Dean Herbert
12e3a3c38a Adjust toolbar fade in/out on toggle 2020-07-08 15:11:26 +09: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
0684ac90c6 Make toolbar opaque
This is the general direction we're going with future designs. Just
applying this now because it makes a lot of screens feel much better
(multiplayer lobby / match, song select etc. where there are elements
adjacent to the bar which cause the transparency to feel a bit awkward).
2020-07-08 14:43:12 +09:00
Bartłomiej Dach
c88a802b05 Adjust font size to match web design 2020-07-07 23:04:39 +02:00
Andrei Zavatski
bdec13d4a4 Move DateTooltip to it's on file 2020-07-07 16:46:17 +03:00
Andrei Zavatski
447cd17cf6 Merge remote-tracking branch 'refs/remotes/ppy/master' into news 2020-07-07 16:36:41 +03:00
Dean Herbert
8152e0791d Fix potential nullref 2020-07-07 21:48:42 +09:00
Dean Herbert
bfcf2f1d92
Merge branch 'master' into fix-changelog-crash 2020-07-07 21:32:59 +09:00
Dean Herbert
8909bf628c Update framework 2020-07-07 21:08:13 +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
c74bfd5c88 Revert unintentional changes 2020-07-07 17:42:46 +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
Andrei Zavatski
857a027a73 Parse HTML entities during APINewsPost deserialisation 2020-07-07 00:11:35 +03:00
Andrei Zavatski
c86bb2e755 Use DrawableDate tooltip for DateContainer 2020-07-07 00:01:06 +03:00
Andrei Zavatski
68d9f9de46 Use DateTimeOffset 2020-07-06 23:55:20 +03:00
Andrei Zavatski
9dde101f12 Remove string prefixes 2020-07-06 23:53:27 +03:00
Andrei Zavatski
040b2a5aa8 Merge remote-tracking branch 'refs/remotes/ppy/master' into news 2020-07-06 23:51:39 +03: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
00a2fbce06 Fix test failures 2020-07-06 22:41:58 +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
smoogipoo
dbbee481f6 Expose dialog body text getter 2020-07-06 22:01:45 +09:00
smoogipoo
09d45ea47a Merge branch 'master' into custom-storage-startup-exception 2020-07-06 20:04:18 +09:00
Andrei Zavatski
fdb7727e95 Rename NewsPost to APINewsPost 2020-07-06 07:28:44 +03:00