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

19088 Commits

Author SHA1 Message Date
Dan Balasescu
73d307114f
Merge branch 'master' into notification-overlay-always-present 2019-06-21 13:12:04 +09:00
Dan Balasescu
da3188b97b
Merge pull request #5082 from peppy/chat-async-improvements
Improve chat startup and channel switching performance
2019-06-21 13:11:59 +09:00
Dan Balasescu
cbc1eff8f1
Merge branch 'master' into chat-async-improvements 2019-06-21 12:59:58 +09:00
Dean Herbert
d0fb08d918
Fix position of gradient in beatmap carousel when scaling UI (#5093)
Fix position of gradient in beatmap carousel when scaling UI

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-21 12:59:38 +09:00
Dan Balasescu
8ab7a8641b
Add comment for why it's not a fill flow 2019-06-21 12:42:35 +09:00
Dan Balasescu
0571bbd555
Merge branch 'master' into carousel-gradient 2019-06-21 12:40:24 +09:00
Dan Balasescu
0cd3e7a35c
Merge pull request #5084 from peppy/music-controller-always-present
Remove necessity for MusicController to be always visible
2019-06-21 12:37:12 +09:00
Dan Balasescu
61d8cb628a
Merge branch 'master' into music-controller-always-present 2019-06-21 11:57:36 +09:00
Dan Balasescu
daad16b5e7
Merge pull request #5083 from peppy/modselect-async-improvements
Fix mod icons in ModSelect being loaded in a blocking fashion
2019-06-21 11:53:17 +09:00
Dan Balasescu
6deee968ac
Merge branch 'master' into modselect-async-improvements 2019-06-21 11:42:25 +09:00
Dan Balasescu
cd52dbf1a7
Merge pull request #5076 from peppy/remove-debug-utils
Remove osu!-side DebugUtils
2019-06-21 11:25:22 +09:00
Dan Balasescu
4d02e17539
Merge branch 'master' into remove-debug-utils 2019-06-21 11:10:59 +09:00
Dean Herbert
fa94f063be Use correct button type 2019-06-21 00:26:55 +09:00
Dean Herbert
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
Dean Herbert
7b4180ce86 Fix failing test 2019-06-20 23:51:47 +09:00
Dean Herbert
f2200594c9 Remove necessity for MusicController to be always visible 2019-06-20 23:40:25 +09:00
Dean Herbert
52ca5f9c00 Fix mod icons in ModSelect being loaded in a blocking fashion 2019-06-20 23:06:07 +09:00
Dean Herbert
74fabf8db4 Improve ChatOverlay load behaviour 2019-06-20 23:02:02 +09:00
Dean Herbert
4a25a84975 Fix DrawableChannel async flow 2019-06-20 23:01:39 +09:00
Dean Herbert
4ef165fdac Fix ChatLine not being correctly loaded asynchronously 2019-06-20 23:01:02 +09:00
Dean Herbert
8c383ddc27 Fix dodgy test scheduling to other tests 2019-06-20 19:23:27 +09:00
Dean Herbert
21a1fd738b Remove the necessity for NotificationOverlay to always be present
Now it will only become present when there is a pending notification.
2019-06-20 19:06:21 +09:00
Dean Herbert
9a663715cd Make get methods of ProgressNotification return correct values immediately
Previously they were only updated after the resultant schedule ran. This would not bode well when the overlay containing them is not present.
2019-06-20 19:05:33 +09:00
David Zhao
65c84428cc Fix position of gradient in beatmap carousel 2019-06-20 15:05:15 +09:00
Dan Balasescu
35ce032be1
Merge pull request #5077 from Joehuu/remove-bad-words-1
Remove bad words on code comments
2019-06-20 13:54:08 +09:00
Joehu
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
Dean Herbert
471c5b7386
Fix a couple of README typos 2019-06-20 11:23:36 +09:00
Dean Herbert
7482ecb8e7
Fix beatmap set cover goes out of its container (#5073)
Fix beatmap set cover goes out of its container
2019-06-20 11:21:22 +09:00
Dean Herbert
a2ca798dc2
Fix scores header is visible even with no scores (#5074)
Fix scores header is visible even with no scores
2019-06-20 11:09:07 +09:00
Andrei Zavatski
e83710d3b8 Add a testcase 2019-06-19 23:15:00 +03:00
Andrei Zavatski
0da8a483c5 Fix scores header is visible even if no scores are loaded 2019-06-19 23:14:53 +03:00
iiSaLMaN
ee2268caba
Enable masking for the beatmap set cover 2019-06-19 21:20:00 +03:00
Dean Herbert
9858419c69
Improve vertical flexibility of BeatmapSetOverlay's header (#5067)
Improve vertical flexibility of BeatmapSetOverlay's header
2019-06-20 02:22:19 +09:00
iiSaLMaN
865af00ab6
Merge branch 'master' into header-improvements 2019-06-19 20:00:28 +03:00
Dean Herbert
a4ceefdc9d
Hide empty categories in mod selector overlay (#5021)
Hide empty categories in mod selector overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-20 01:59:30 +09:00
Dean Herbert
cd2999d0d1 Rename mod select test scene 2019-06-20 01:40:58 +09:00
Dean Herbert
08cf8dd299 Adjust for readability 2019-06-20 01:39:54 +09:00
Dean Herbert
2773cfba42
Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-20 01:35:24 +09:00
Dean Herbert
bcee8fe9c3
Show user online status in user overlay (#5058)
Show user online status in user overlay
2019-06-20 01:31:24 +09:00
iiSaLMaN
3e285e5dde
Separate beatmap info container from details (avoid overlapping) 2019-06-19 17:47:47 +03:00
iiSaLMaN
15229f3a23
Make header expandable 2019-06-19 17:45:39 +03:00
iiSaLMaN
5fb4f2fadf
Add TOP_PADDING 2019-06-19 17:38:43 +03:00
Andrei Zavatski
e16de58450 Add a testcase 2019-06-19 12:34:01 +03:00
Andrei Zavatski
17749e84f9 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-online-fix 2019-06-19 12:17:31 +03:00
Dean Herbert
82515a52fe
Fix audio being dimmed during multiplayer (#5041)
Fix audio being dimmed during multiplayer

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-19 14:45:51 +09:00
Dean Herbert
3043f42eb5
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 14:36:05 +09:00
Dan Balasescu
0895a01172
Merge pull request #5064 from peppy/fix-main-menu-nullref
Fix startup crash if main menu does not load fast enough
2019-06-19 14:17:00 +09:00
Dean Herbert
b51aad7433
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 13:36:25 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00