Commit Graph

17673 Commits

Author SHA1 Message Date
b50bad0072 Merge branch 'master' into editor-clock 2018-04-12 19:29:58 +09:00
3ddf00ee74 Merge branch 'master' into high-level-xmldoc 2018-04-12 19:05:10 +09:00
461e063f19 Rename RankStatus to BeatmapSearchCategory 2018-04-11 22:50:39 -07:00
baae4427ff Move string-token property to OAuth 2018-04-12 14:30:28 +09:00
e007365916 Save OAuth token to config on every token change 2018-04-12 14:23:49 +09:00
6e35910419 Remove start/stop clock logic
Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.
2018-04-12 14:06:36 +09:00
a2484fbf56 Move back to DI-ing adjustable clock into SummaryTimeline 2018-04-12 13:37:02 +09:00
fbc50d6030 Merge master into editor-clock 2018-04-12 13:35:53 +09:00
9e2494c57b Merge branch 'master' into high-level-xmldoc 2018-04-12 12:59:37 +09:00
0bede52381 Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places. 2018-04-11 16:22:27 -03:00
4927abfde5 Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages 2018-04-11 20:54:08 +02:00
a5e0311253 Trim whitespaces 2018-04-11 20:53:35 +02:00
6e81fda40e Merge branch 'master' into Private_Messages 2018-04-11 20:48:06 +02:00
499ecd3843 Fix the warnings 2018-04-11 20:44:35 +02:00
c2020742b2 Actually use the fact that ChannelManager is now a component 2018-04-11 20:37:51 +02:00
2056258def Fix code sanity 2018-04-11 20:31:16 +02:00
697b551f3e Fix Selected tab beeing choosen multiple times 2018-04-11 20:27:33 +02:00
d7812ab12e CursorOverrideContainer.ShowMenuCursor 2018-04-11 21:22:52 +03:00
3860594f40 Rename everything into channel and remove everything chat 2018-04-11 20:01:57 +02:00
39ecc3d31d Add Test Case, improve displaying the avatar, use a chatTabControl instead of putting both in ChatOverlay, readd shadow.
Requires osu-framework for a fix
2018-04-11 18:23:09 +02:00
6a8f568f66 BeatmapContainer -> beatmapContainer 2018-04-11 16:32:58 +03:00
6cdfaffcf7 PaginatedBeatmapContainer.BeganPlayingPreview 2018-04-11 16:19:21 +03:00
903dd7a015 Fix regression causing hard crash
Regressed in #2373. My bad.
2018-04-11 19:24:19 +09:00
90beff83f6 Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width 2018-04-11 08:07:26 +02:00
38277bff35 Changed mapping of deleting key binding to shift+delete 2018-04-10 18:00:22 +02:00
d851446aca Remove redundant anchor and use Show/Hide instead of FadeIn/Out. 2018-04-10 19:15:37 +05:30
767ecb4422 Fix rank status 2018-04-10 00:11:53 -07:00
c33cb9c02e Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
85f736ae89 Allow opening a new chat with right click on User
Allow faster viewing of the usertab using lasy loading
2018-04-09 23:14:39 +02:00
762b4412e5 Convert if to switch 2018-04-09 22:29:48 +02:00
5512d58c1d Remove the sealed modifier 2018-04-09 21:06:05 +02:00
9225c06872 Merge branch 'master' into hide_menu_cursor 2018-04-09 21:41:54 +03:00
dbee936748 Allow mapping delete key via alt+delete key combination 2018-04-09 18:48:47 +02:00
b97c4e8b44 Fix all possible cases of crossthread import data races 2018-04-09 12:45:44 +09:00
aa26ea483d remove using, remove empty agrument list 2018-04-08 22:43:01 +02:00
2a314f052a Trim more whitespace 2018-04-08 22:28:50 +02:00
0a207e00d5 Trim whilespace 2018-04-08 22:24:55 +02:00
4b7ffd09d9 Trim whitespace 2018-04-08 22:18:29 +02:00
a48ccb5603 Implement Private chat 2018-04-08 22:12:57 +02:00
a70b329155 Split drawing and business logic of ChatOverlay 2018-04-08 18:21:48 +02:00
525e50e8dd Merge remote-tracking branch 'origin/master' into Private_Messages 2018-04-08 15:23:09 +02:00
f1696eae92 Use IEnumable instead of List 2018-04-08 15:01:14 +02:00
421e9e0641 Add xmldoc to some high-level classes to explain their separation 2018-04-08 12:58:34 +09:00
640be621ac Handle multiple song previews playing in different beatmap categories on profile 2018-04-07 13:29:46 +03:00
c2a2457160 Merge branch 'master' into manual-input-test-case 2018-04-06 20:42:08 +09:00
1895111c75 Merge branch 'master' into dynamic-assembly-update 2018-04-06 20:16:13 +09:00
6bc319caae Merge branch 'master' into manual-input-test-case 2018-04-06 20:07:07 +09:00
cd48cb1887 Add comment 2018-04-06 19:53:23 +09:00
070e68f235 Give the test case clock an accurate IsRunning value 2018-04-06 19:14:04 +09:00
e59124962c Remove re-instantiation of clock in EditorClockTestCase 2018-04-06 18:38:44 +09:00