Commit Graph

13435 Commits

Author SHA1 Message Date
0f9c47686f Merge branch 'master' into difficulty-icon-tooltip 2019-08-19 12:21:23 +09:00
f20085df54 Merge branch 'master' into refactor-difficulty-colours 2019-08-19 11:39:19 +09:00
1f00793891 Unpause music when changing selection at song select 2019-08-19 11:30:04 +09:00
a51fbfa31b Fix osu! default tooltips not displaying 2019-08-19 10:46:28 +09:00
015406f4d2 Fix link parser 2019-08-18 22:02:59 +03:00
3fcd786198 Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control. 2019-08-18 19:32:56 +02:00
ecc04baf14 Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip 2019-08-17 15:35:28 +09:00
87dc6499fa Fix json decoding being a bit too eager to consume 2019-08-17 15:34:02 +09:00
097763bb1c Add auto size duration 2019-08-17 15:29:39 +09:00
50046d5f69 Use new tooltip style 2019-08-17 15:20:27 +09:00
3dc81bdad5 Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip 2019-08-17 15:19:46 +09:00
4fa9abeece Replace DifficultyColouredContainer with a more scalable solution 2019-08-17 15:16:24 +09:00
f552de6ebc Merge branch 'master' into difficulty-icon-tooltip 2019-08-17 13:45:20 +09:00
0484caf430 Merge branch 'master' into animated-legacy-skins 2019-08-16 21:12:59 +09:00
8258c4a80a Merge pull request #5734 from smoogipoo/non-frame-stable-editor
Disable frame-stable playback in the editor

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-16 21:12:25 +09:00
152df9f3d5 Remove accidental blank line 2019-08-16 20:23:09 +09:00
d11b896148 Move FrameStablePlayback handling to early return 2019-08-16 20:21:00 +09:00
58d2268b9e Combine conditionals that provide the same behaviour 2019-08-16 19:52:35 +09:00
132d51a2cc Update tooltip implementation 2019-08-16 19:47:35 +09:00
536e7d8757 Update framework 2019-08-16 19:32:17 +09:00
d771c271a3 Merge remote-tracking branch 'upstream/master' into fix-checkbox-sounds 2019-08-16 19:32:01 +09:00
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
8c67f58e2d Disable frame-stable playback in the editor 2019-08-15 18:25:31 +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
f7a92487ef Fix checkbox sounds playing too often 2019-08-15 14:09:30 +09:00
e73a9c2748 Fix song select context menus displaying off-screen 2019-08-15 14:06:29 +09:00
f355cff8bc Apply reviews 2019-08-15 12:11:54 +09:00
7e74953784 Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip 2019-08-15 11:54:59 +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