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

4615 Commits

Author SHA1 Message Date
MrTheMake
306feb177a Fix null pointer reference 2017-05-20 20:18:29 +02:00
MrTheMake
031fddc995 Fix current beatmap track is started again when entering songselect and changing to another difficulty from the same beatmap set. 2017-05-20 19:53:18 +02:00
Dean Herbert
5d818620c9 Merge pull request #804 from peppy/debug-config-rename
FrameworkDebugConfig -> DebugSetting
2017-05-20 01:44:40 +09:00
Dean Herbert
c2572eea27 Merge branch 'master' into debug-config-rename 2017-05-20 01:15:55 +09:00
Dean Herbert
c33f418c02 Merge pull request #801 from peppy/skip-redesign
Skip button redesign & refactor
2017-05-20 01:15:43 +09:00
Dean Herbert
a34d9d8b09 Oops 2017-05-20 01:14:51 +09:00
Dean Herbert
9c9c0a64fd Merge branch 'master' into debug-config-rename 2017-05-20 00:45:16 +09:00
Dean Herbert
9aca8fc843 Update framework 2017-05-20 00:43:17 +09:00
Dean Herbert
561b517dec Merge branch 'master' into skip-redesign 2017-05-20 00:42:04 +09:00
Dan Balasescu
fb1bd7b3e5 Merge pull request #803 from peppy/osd-fixes
Minor visual fixes for OSD
2017-05-20 00:35:37 +09:00
Dan Balasescu
7e8ffe8f34 Merge branch 'master' into osd-fixes 2017-05-20 00:12:10 +09:00
Dan Balasescu
14647a0e5f Merge pull request #802 from peppy/debug-log-option
Add setting checkbox to toggle debug logs
2017-05-20 00:11:39 +09:00
Dean Herbert
528d79be51 FrameworkDebugConfig -> DebugSetting 2017-05-19 22:53:26 +09:00
Dean Herbert
0332348b24 Correctly display default audio device on OSD 2017-05-19 22:51:09 +09:00
Dean Herbert
5bcef91b89 Add padding to setting value on on screen display
Long audio device names were destroying all padding.
2017-05-19 22:49:47 +09:00
Dean Herbert
04f7acb68a Add setting checkbox to toggle debug logs 2017-05-19 22:47:15 +09:00
Dean Herbert
674731f9bb Add sound back to skip action 2017-05-19 22:23:48 +09:00
Dean Herbert
60f960aafd Fix audio clock breakage. 2017-05-19 22:19:20 +09:00
Dean Herbert
20156d26f9 Don't rely on parent's clock 2017-05-19 22:12:09 +09:00
Dean Herbert
aef82acb0d Update skip button design 2017-05-19 21:54:14 +09:00
Dan Balasescu
9e9df4ada5 Merge pull request #788 from smoogipooo/mania-beatmap-conversion
Mania beatmap conversion
2017-05-19 21:18:21 +09:00
Dean Herbert
da31d129ee Merge branch 'master' into mania-beatmap-conversion 2017-05-19 18:18:59 +09:00
Dean Herbert
a7d16ac213 Move skip logic to inside SkipButton 2017-05-19 18:18:21 +09:00
smoogipooo
7b05930fc2 Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects."
This reverts commit 6821197a6a.
2017-05-19 17:38:06 +09:00
smoogipooo
860b607f45 A bit more cleanup. 2017-05-19 16:49:05 +09:00
smoogipooo
1cb3fc7262 Oops fix unused using. 2017-05-19 16:45:06 +09:00
smoogipooo
6821197a6a Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects. 2017-05-19 16:40:01 +09:00
smoogipooo
2cea5f0fa3 Add comments. 2017-05-19 16:39:02 +09:00
Dean Herbert
1390cb5550 Merge pull request #799 from peppy/fix-early-inactive-pause
Fix audio beginning to play when potentially paused due to inactive window
2017-05-19 16:32:11 +09:00
smoogipooo
9191c4f3e3 Remove LegacyBeatmapConverter. 2017-05-19 16:31:56 +09:00
Dean Herbert
36b628bbcc Merge branch 'master' into fix-early-inactive-pause 2017-05-19 16:21:20 +09:00
Dean Herbert
069569fefd Merge pull request #797 from peppy/fix-unnecessary-seeks
Fix audio seeking when entering play mode in certain cases
2017-05-19 16:21:15 +09:00
smoogipooo
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
Dan Balasescu
0e469feb17 Merge branch 'master' into fix-unnecessary-seeks 2017-05-19 15:10:13 +09:00
Dan Balasescu
a43b122914 Merge pull request #796 from peppy/allow-searching-author
Add support for searching beatmap author at song select
2017-05-19 15:10:03 +09:00
Dan Balasescu
f2cbba48ef Merge branch 'master' into allow-searching-author 2017-05-19 15:05:22 +09:00
Dean Herbert
01398fae56 Merge pull request #787 from MrTheMake/auto-fix
Fixes the auto mod not hitting stacks of notes on certain maps.
2017-05-19 14:26:42 +09:00
Dean Herbert
85339ace02 Merge branch 'master' into auto-fix 2017-05-19 13:54:32 +09:00
Dean Herbert
bfd37d0350 Fix audio beginning to play when potentially paused due to inactive window
Also removes all usage of Delay() in Player.
Resolves #793.
2017-05-19 13:53:09 +09:00
Dean Herbert
5ae3a7143e Fix audio seeking when entering play mode in certain cases
Resolves #794
2017-05-19 13:23:11 +09:00
Dean Herbert
c51d640241 Add support for searching beatmap author at song select
Resolves #792
2017-05-19 13:13:27 +09:00
Dean Herbert
9b8d7745c7 Merge pull request #791 from peppy/spinner-refresh
Spinner design refresh
2017-05-18 22:37:45 +09:00
Dean Herbert
3004a44b98 Further colour adjustments 2017-05-18 22:21:41 +09:00
Dean Herbert
c78dfb4a13 Oops colours were wrong 2017-05-18 21:56:19 +09:00
Dean Herbert
e3ae2bca6d Design improvements
paired with smoogi
2017-05-18 21:38:19 +09:00
Dean Herbert
4100c4fe9f Fix order of methods 2017-05-18 21:04:09 +09:00
Dean Herbert
ae676b48b2 Fix whitespace 2017-05-18 19:51:45 +09:00
Dean Herbert
9cd41c0e87 Spinner design refresh 2017-05-18 19:42:20 +09:00
Dean Herbert
f112546085 Don't load a mode when opening TestCaseHitObjects 2017-05-18 19:42:20 +09:00
smoogipooo
4e8ead9cf4 Fix possible nullref. 2017-05-18 19:05:03 +09:00