1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 11:27:24 +08:00
Commit Graph

11450 Commits

Author SHA1 Message Date
TocoToucan
dd5cc59250 Introduce 'Capture menu cursor' setting 2018-03-23 22:53:06 +03:00
Dean Herbert
092ba4833e
Merge pull request #2296 from smoogipoo/fix-background-fade
Fix beatmap background fade not being updated on retry
2018-03-24 04:06:13 +09:00
Dean Herbert
e47aa0edc0
Merge branch 'master' into fix-background-fade 2018-03-24 03:40:13 +09:00
Dean Herbert
802ef3e3ff
Merge pull request #2293 from peppy/fix-api-abort
Fix API never stopping its thread
2018-03-24 03:34:01 +09:00
Dean Herbert
0976e83b33
Merge branch 'master' into fix-api-abort 2018-03-24 03:13:28 +09:00
Dan Balasescu
19900bb949
Merge pull request #2290 from Joehuu/add-perfect-mod-icon
Add perfect mod icon
2018-03-23 21:51:45 +09:00
Dan Balasescu
1576b31a48
Merge branch 'master' into add-perfect-mod-icon 2018-03-23 21:32:15 +09:00
Dan Balasescu
8f1db1c4b4
Merge pull request #2255 from peppy/fix-mod-button-sounds
Fix mod button sounds playing when mod overlay is not visible
2018-03-23 21:32:05 +09:00
Dan Balasescu
676feb3658
Merge branch 'master' into fix-mod-button-sounds 2018-03-23 21:03:42 +09:00
Dan Balasescu
15b33af6c8
Merge pull request #2292 from peppy/fix-player-disposal
Fix player not getting disposed in some scenarios
2018-03-23 21:01:22 +09:00
smoogipoo
f0c0a51108 Convert APIAccess to use cancellation tokens 2018-03-23 20:57:04 +09:00
Dan Balasescu
9ab3610b95
Merge branch 'master' into fix-player-disposal 2018-03-23 20:45:42 +09:00
smoogipoo
afdab7895a Fix beatmap background fade not being updated on retry
Fixes #2287
2018-03-23 20:41:38 +09:00
Dean Herbert
342341d60f
Merge pull request #2294 from smoogipoo/fix-circularprogress-glow
Fix volume glow being cut off
2018-03-23 20:30:17 +09:00
Dean Herbert
32b7565fac
Merge branch 'master' into fix-circularprogress-glow 2018-03-23 19:49:18 +09:00
Dan Balasescu
23a3958e04
Merge pull request #2257 from peppy/cursor-skinning
Add the ability to skin the gameplay cursor
2018-03-23 19:32:20 +09:00
Dan Balasescu
1b74b4e5df
Merge branch 'master' into cursor-skinning 2018-03-23 19:13:56 +09:00
Dean Herbert
b4eaaa4fd1
Merge branch 'master' into fix-circularprogress-glow 2018-03-23 19:01:28 +09:00
Dan Balasescu
1ffe0c7416
Merge pull request #2289 from peppy/fix-song-select-flush
Fix BeatmapCarousel's flush not correctly applying selection changes
2018-03-23 18:59:12 +09:00
smoogipoo
52fa837447 Fix volume glow being cut off
Fixes #2285.
2018-03-23 18:17:23 +09:00
Dean Herbert
6c4e719e0f Fix API never stopping its thread 2018-03-23 15:46:55 +09:00
Dean Herbert
eb751fa607 Fix event unbind not being unbound correctly 2018-03-23 15:05:28 +09:00
Dean Herbert
b56eee1927 Fix background loaded player never being disposed if early exit occurs 2018-03-23 15:04:40 +09:00
Joseph Madamba
f77dad2809
Add perfect mod icon 2018-03-22 22:49:14 -07:00
Dean Herbert
d4aeb3d00b Fix BeatmapCarousel's flush not correctly applying selection changes
They may have been delayed until the next Update, which is too late in this case.
2018-03-23 12:10:13 +09:00
Dean Herbert
fd124d2ee6
Merge branch 'master' into fix-mod-button-sounds 2018-03-22 21:55:15 +09:00
Dean Herbert
72531229fe
Merge pull request #2199 from UselessToucan/take_screenshot
Add the ability to take in-game screenshots
2018-03-22 21:53:34 +09:00
Dean Herbert
1d3c9098b8 Load component asynchronously 2018-03-22 21:42:57 +09:00
Dean Herbert
e7cb579ec4
Merge branch 'master' into take_screenshot 2018-03-22 21:34:53 +09:00
Dan Balasescu
5b73f49fd4
Merge pull request #2280 from peppy/notification-visibility
Restore old auto-popout notification overlay behaviour
2018-03-22 21:22:36 +09:00
Dean Herbert
9d3529ce7b
Merge branch 'master' into cursor-skinning 2018-03-22 21:07:16 +09:00
Dean Herbert
14a653aa28 Restore old auto-popout notification overlay behaviour 2018-03-22 20:55:00 +09:00
Dean Herbert
74191e1b73 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-22 20:49:17 +09:00
Dean Herbert
e41993ac44 Don't bother with an exception that will never happen
Wasn't being caught anyways
2018-03-22 20:45:26 +09:00
Dean Herbert
94847e4a23 Allow clicking notification to open screenshot folder 2018-03-22 20:44:00 +09:00
Dean Herbert
9e080028ff Add shutter sound 2018-03-22 20:42:55 +09:00
Dean Herbert
bedb427ceb
Merge pull request #2247 from smoogipoo/beat-snap-divisor
Implement the editor's beat snap divisor
2018-03-22 20:39:12 +09:00
Dean Herbert
4883e2fd5b
Merge branch 'master' into beat-snap-divisor 2018-03-22 20:24:10 +09:00
Dean Herbert
8b7640f137
Merge pull request #2256 from peppy/skin-scaling
Add scale adjusts to bring legacy skins in-line with lazer sizing
2018-03-22 20:23:58 +09:00
Dean Herbert
92d8781bf0
Merge branch 'master' into beat-snap-divisor 2018-03-22 20:14:50 +09:00
smoogipoo
2b7d22c4ea Very slightly reduce size of slider bar to increase bottom padding 2018-03-22 20:11:55 +09:00
Dan Balasescu
4e2c6ccedc
Merge branch 'master' into skin-scaling 2018-03-22 20:11:30 +09:00
Dean Herbert
ff41ad976b
Merge pull request #2270 from peppy/fix-player-loader
Fix retry not allowing continuing beyond PlayerLoader
2018-03-22 20:09:57 +09:00
smoogipoo
88ad3db022 Update framework 2018-03-22 20:00:57 +09:00
smoogipoo
090c78bf10 Merge remote-tracking branch 'origin/master' into fix-player-loader 2018-03-22 20:00:21 +09:00
Dan Balasescu
a6bcb0bbd1
Merge pull request #2279 from peppy/fix-settings-notification-verlay
Only allow settings or notifications to be visible at once
2018-03-22 19:59:31 +09:00
Dean Herbert
e5f83530b8 Only allow settings or notifications to be visible at once
Resolves #2273.
2018-03-22 19:49:31 +09:00
Dean Herbert
ee12d75b30
Merge branch 'master' into skin-scaling 2018-03-22 19:30:17 +09:00
Dan Balasescu
61ef635743
Merge pull request #2254 from peppy/skin--completion
Add skin/beatmap lookup hierarchy
2018-03-22 19:28:35 +09:00
Dean Herbert
2d08cee3b4
Merge branch 'master' into skin--completion 2018-03-22 19:04:22 +09:00