1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

4633 Commits

Author SHA1 Message Date
smoogipooo
8c260e3364 Renamings + refactorings to Pattern. 2017-05-22 10:04:25 +09:00
smoogipooo
9de18d45a5 Use bitshifted notation. 2017-05-22 10:00:11 +09:00
Dan Balasescu
0ddf2cb454 Merge pull request #817 from peppy/spinner-colour-rehash
Update spinner colours
2017-05-22 09:38:12 +09:00
Dan Balasescu
256cf90305 Merge branch 'master' into spinner-colour-rehash 2017-05-22 09:22:49 +09:00
Dean Herbert
a2c7e3b859 Merge pull request #818 from Jorolf/more-freedom
Allow for solutions where the osu repository isn't at the solution level
2017-05-22 08:43:19 +09:00
Jorolf
5b244367ee allow for solutions were the osu repository isn't at the solution level 2017-05-21 20:29:05 +02:00
Dean Herbert
8f3ab79918 Simplify SpinnerTicks & CI fixes 2017-05-21 17:31:35 +09:00
Dean Herbert
95498fe6df Adjust spinner colours making use of EdgeEffect.Hollow 2017-05-21 17:21:49 +09:00
Dean Herbert
18a7271dc6 Update framework 2017-05-21 17:07:16 +09:00
Dean Herbert
82f2927f1a Merge pull request #808 from DrabWeb/playlist-item-paragraph
Make PlaylistItem use Paragraphs
2017-05-20 15:54:54 +09:00
Dean Herbert
fb72693c96 Merge branch 'master' into playlist-item-paragraph 2017-05-20 15:47:54 +09:00
Dean Herbert
808f5c3ae3 Merge pull request #807 from DrabWeb/mod-tooltips
Mod button tooltips
2017-05-20 15:46:34 +09:00
DrabWeb
995a573b9c @"" -> string.Empty 2017-05-20 03:22:37 -03:00
DrabWeb
7485a78128 Update framework 2017-05-20 03:14:22 -03:00
DrabWeb
139b03a1ce Only recreate text once per unicode option change 2017-05-20 02:05:13 -03:00
DrabWeb
43bd0f686b Fix artist being the opposite value 2017-05-20 01:25:42 -03:00
DrabWeb
48417beb81 Unused using directive 2017-05-20 01:22:33 -03:00
DrabWeb
615082d757 Remove whitespace 2017-05-20 01:17:04 -03:00
DrabWeb
dcc3dbf5e2 Make PlaylistItem use Paragraphs 2017-05-20 01:11:20 -03:00
DrabWeb
bfedd42ca4 Add mod tooltips 2017-05-19 23:56:48 -03: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