1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 10:13:21 +08:00
Commit Graph

2654 Commits

Author SHA1 Message Date
Dean Herbert
0bc4a01a6b Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-24 20:03:25 +09:00
smoogipoo
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
smoogipoo
df004d7a49 Adjust dialog text 2018-11-23 15:19:15 +09:00
smoogipoo
ac73844fe0 Fix header potentially overflowing the dialog 2018-11-23 15:19:09 +09:00
Dean Herbert
1b76e2faf5
Merge branch 'master' into fix-editor-precise-scroll 2018-11-23 09:57:35 +09:00
Dan Balasescu
0ee4b1c4ac
Merge branch 'master' into fix-channel-presence 2018-11-22 21:52:16 +09:00
Dean Herbert
10047e6815 Adjust tick-based wheel control to be more correct 2018-11-22 20:13:40 +09:00
Dean Herbert
61fdfe39fd Add comment 2018-11-22 19:21:32 +09:00
smoogipoo
d1ec9fc294 Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence 2018-11-22 13:04:32 +09:00
smoogipoo
5caa67d735 Hide playlist when MusicController is hidden 2018-11-22 12:12:34 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
Dean Herbert
eab2776755 Fix a crash on leaving the selected channel 2018-11-21 17:15:15 +09:00
smoogipoo
5ad96afea0 Fix crashes when importing/deleting from model managers 2018-11-20 18:09:23 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
23a446bab2 Add support for all channel types 2018-11-20 15:03:55 +09:00
Roman Kapustin
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
Dean Herbert
d09b674fb3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-16 20:36:08 +09:00
Dean Herbert
b574a07f23 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-15 13:31:34 +09:00
HoLLy
9dd3d28436 Fix SettingsTextBox having width of 0 2018-11-14 22:29:11 +01:00
smoogipoo
f1f2fc133a Use SkinInfo directly 2018-11-14 19:29:20 +09:00
smoogipoo
aff5fa6169 Update with osu!-side dropdown changes 2018-11-14 18:02:38 +09:00
Dean Herbert
396a5b3cd0
Merge branch 'master' into Private_Messages 2018-11-14 12:49:54 +09:00
Dean Herbert
b9278b3488 Fix brackets 2018-11-14 12:05:07 +09:00
Dean Herbert
c77412992e Merge conditionals 2018-11-14 11:53:34 +09:00
Dean Herbert
f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
Dean Herbert
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
Dean Herbert
86aab9c31b Fix chat making needless requests 2018-11-10 08:54:56 +09:00
gotopie
4c9dcdf156 hide seekbar when no song is playing 2018-11-02 19:04:30 -04:00
Roman Kapustin
b4809f4417 External link warning code cleanup 2018-11-01 23:52:07 +03:00
Dean Herbert
0f1ffe392f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-01 17:52:24 +09:00
Dean Herbert
94093ac948 Update beatmap search API to match latest osu-web structure 2018-10-23 18:05:41 +09:00
Roman Kapustin
805f8d98c4 Implement warn about opening external links option 2018-10-22 23:57:37 +03:00
Roman Kapustin
b4c68f4cf7 Show a warning prior to opening external links 2018-10-22 23:16:57 +03:00
Dean Herbert
aaa8aca695 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-10-20 23:00:56 +09:00
Paul Teng
7720fa10eb Reduce height of RankChartLineGraph 2018-10-17 20:19:01 -04:00
Dean Herbert
a4bb4255b1 Add grouping manager 2018-10-13 07:10:13 +09:00
Dean Herbert
77055f6d5c Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-10-12 18:49:47 +09:00
Dean Herbert
f7c887cf79
Merge branch 'master' into debounce-seeks 2018-10-12 17:50:39 +09:00
Paul Teng
2181f34f74
Merge branch 'master' into result-no-gamemode-switch 2018-10-10 06:43:01 -04:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
Paul Teng
a91dda1a89
Merge branch 'master' into result-no-gamemode-switch 2018-10-09 13:04:53 -04:00
Paul Teng
ae79c3832e Add base. for safety 2018-10-09 11:05:15 -04:00
smoogipoo
ccb6723711 Debounce music controller seeks 2018-10-09 16:50:29 +09:00
Dean Herbert
a171ed3500 Fix joined channels not appearing as joined in the channel list 2018-10-09 16:12:20 +09:00
Paul Teng
ca9cbf1aea Fix rulsets being completed unselectable 2018-10-06 07:51:56 -04:00
Paul Teng
8b27741cb0 Do not propagate positional input to subtree 2018-10-05 11:37:44 -04:00
Paul Teng
8264dd49de Update bindable only if enabled 2018-10-05 07:13:18 -04:00
Dean Herbert
716eee9a5c Fix last visit not supporting null values
Can now be null if a user chooses to hide their online status
2018-10-05 00:25:40 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00