Commit Graph

13346 Commits

Author SHA1 Message Date
059d90bc42 Merge branch 'master' into reduce-hold-to-confirm-delay 2019-08-16 14:00:43 +09:00
d732d276b1 Make activation delay customisable 2019-08-16 13:21:41 +09:00
b57298406f Fix right click blocking not resetting correctly 2019-08-15 19:25:33 +09:00
fc05cab050 Merge remote-tracking branch 'upstream/master' into fix-song-select-context-menus 2019-08-15 18:27:49 +09:00
0f4bada21e Fix right click absolute scrolling interfering with context menus 2019-08-15 18:27:45 +09:00
ef5ed915e5 Reduce delay for hold-to-confirm controls 2019-08-15 17:14:00 +09:00
8f63887972 Make use of existing null check 2019-08-15 14:38:49 +09:00
9e13a6aeae Fix newlines being considered in user profile content 2019-08-15 14:38:04 +09:00
e73a9c2748 Fix song select context menus displaying off-screen 2019-08-15 14:06:29 +09:00
3379672a43 Bump ppy.osu.Framework from 2019.813.0 to 2019.814.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.814.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.814.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-14 12:17:17 +00:00
3a79a4149a Disable music controls when beatmap is disabled 2019-08-14 15:19:21 +09:00
52f42ddade Use child instead of children 2019-08-14 10:53:47 +09:00
b6bc84af2c Fix chat context menus displaying out-of-bounds 2019-08-14 10:52:26 +09:00
8ce2c876bf Merge branch 'master' into multi-room-update 2019-08-13 21:03:03 +09:00
5963f7d914 Update comment 2019-08-13 19:52:40 +09:00
ea18a8dd12 Merge branch 'master' into music-controller-hotkeys 2019-08-13 19:08:52 +09:00
e356cc8d9e Refactor MatchBeatmapPanel for thread safety 2019-08-13 17:57:16 +09:00
f2e596de16 Bump ppy.osu.Framework from 2019.809.0 to 2019.813.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.809.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.809.0...2019.813.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-13 08:54:17 +00:00
7c9c9f1ce1 Simplify caching 2019-08-13 17:38:21 +09:00
92c2dafa12 Tighten accessibility 2019-08-13 17:34:16 +09:00
6b57c9801d Cull some unnecessary whitespace 2019-08-13 17:32:43 +09:00
2b155e5407 Merge remote-tracking branch 'origin/master' into multi-room-update 2019-08-13 17:03:44 +09:00
77fca7b04a Merge branch 'master' into split-out-music-controller 2019-08-13 17:03:15 +09:00
4948e7d31c Merge branch 'master' into split-out-music-controller 2019-08-13 16:43:56 +09:00
f6e1df8952 Merge branch 'master' into triangles 2019-08-13 16:34:08 +09:00
6a70849acb Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 15:08:33 +09:00
b942192e00 Fix remaining nullref 2019-08-13 15:04:04 +09:00
81f8b5f325 Fix merge issue 2019-08-13 14:52:51 +09:00
5898198da6 Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:48:14 +09:00
2cbdf8c01c Update public methods in line with future usage 2019-08-13 14:46:57 +09:00
de1ab56a2c Fix potential nullref on disposal 2019-08-13 14:45:27 +09:00
9aac5efa4e Move logic out of OsuGame 2019-08-13 14:42:59 +09:00
8d23cda51a Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:33:35 +09:00
ad24265730 Split visual component out of MusicController 2019-08-13 14:30:18 +09:00
9c43021c28 Merge branch 'master' into previous-usernames 2019-08-13 14:21:44 +09:00
8d3f2f7645 Drop container from name 2019-08-13 14:09:10 +09:00
5681d1097c Move into components namespace 2019-08-13 14:07:40 +09:00
5dbde38a6b Group key bindings together 2019-08-13 12:40:20 +09:00
f3380c9372 Remove "jukebox" terminology 2019-08-13 12:06:57 +09:00
6328fd9363 Merge remote-tracking branch 'upstream/master' into music-controller-hotkeys 2019-08-13 11:57:18 +09:00
4ccac60337 Merge remote-tracking branch 'upstream/master' into refactor-osd 2019-08-13 11:35:54 +09:00
5447e7cf22 Fix file ordering 2019-08-13 11:34:45 +09:00
433b701df3 Make line slightly thicker (to display better at low resolutions)
Also tidies up code.
2019-08-13 00:21:52 +09:00
a7ae0e6677 Merge remote-tracking branch 'upstream/master' into beatmap-scope-selector 2019-08-13 00:16:53 +09:00
c0f0fbbaa9 Rename variable and add xmldoc 2019-08-13 00:14:37 +09:00
883102ee5d Move score multiplier logic inside score calculation 2019-08-12 16:40:52 +03:00
9c36cb4af4 Use existing AccentColour logic instead of weird BoxColour 2019-08-12 14:33:30 +03:00
ba49a4c2da Use existing PageTabControl for layout 2019-08-12 13:16:57 +03:00
6533f114d4 Apply review suggestions 2019-08-12 12:09:09 +02:00
fc521ac93b Expose BoxColour property 2019-08-12 13:08:15 +03:00