1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 02:22:59 +08:00
Commit Graph

4928 Commits

Author SHA1 Message Date
DrabWeb
649fc8362b Fix ranked status dropdown expanding below the panels 2017-05-19 18:54:47 -03:00
Huo Yaoyuan
058c5e18a4 Scrolling support for SectionsContainer. 2017-05-20 05:48:40 +08:00
DrabWeb
2f10b72cb2 Proper dropdown expansion, DisplayModeToggleButton -> DisplayStyleToggleButton 2017-05-19 18:32:04 -03:00
Huo Yaoyuan
24a813e907 Basic children management of SectionsContainer. 2017-05-20 05:15:57 +08:00
DrabWeb
05b8fc5126 Added switching between grid/list and little transitions for the panels 2017-05-19 17:52:34 -03:00
DrabWeb
1d61fc84c7 Remove duplicate code in SettingsEnumDropdown 2017-05-19 17:04:59 -03:00
DrabWeb
5b2c74be50 Remove Direct folder from csproj 2017-05-19 16:24:27 -03:00
DrabWeb
1bd13a8361 Indentation 2017-05-19 16:22:54 -03:00
DrabWeb
74ed4cf0e3 More cleanup 2017-05-19 16:19:23 -03:00
DrabWeb
6eac19e76b Move constructor above methods in DirectPanel 2017-05-19 16:12:47 -03:00
DrabWeb
c3d753a585 DifficultyIcons -> GetDifficultyIcons() 2017-05-19 16:11:45 -03:00
DrabWeb
a86d07cac7 Remove enclosing background container 2017-05-19 16:07:05 -03:00
DrabWeb
c6320c0f11 BeatmapBackgroundSprite public -> internal 2017-05-19 16:02:42 -03:00
DrabWeb
e1c4c36122 +BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds 2017-05-19 15:43:18 -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
DrabWeb
3b8cadd4df Clean up DirectPanel and it's subclasses 2017-05-19 12:52:23 -03: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
ff0d32bda5 Merge branch 'master' into mania-distance-object-conversion 2017-05-19 21:18:51 +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
smoogipooo
8d94c2ef8b Fix CI errors (for now). 2017-05-19 21:17:14 +09:00
smoogipooo
f8270f31a9 Fix build errors. 2017-05-19 21:15:29 +09:00
smoogipooo
6ab7a91415 Add generator to generate patterns from HitObjects. 2017-05-19 20:57:20 +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
e76cb4cc31 Update to match base branch. 2017-05-19 17:51:59 +09:00
smoogipooo
0a596ef1e4 Merge branch 'mania-beatmap-conversion' into mania-endtime-object-conversion
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-19 17:50:19 +09:00
smoogipooo
90270ac586 Update to match base branch. 2017-05-19 17:48:23 +09:00
smoogipooo
5d8f0a4707 Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-19 17:42:24 +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