1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 20:47:24 +08:00
Commit Graph

5202 Commits

Author SHA1 Message Date
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
Jorolf
94484974f9 use AddTabItem instead + Bindable for ChannelSelectorTabItem 2017-05-19 11:59:23 +02: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
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
Javier Flores
793b760ff2 Cleanup logic 2017-05-18 20:19:00 -05:00
DrabWeb
a5fa7e1a7d Result counts displaying 2017-05-18 17:43:39 -03:00
DrabWeb
1d1375c4d4 Remove commented line 2017-05-18 17:13:53 -03:00
DrabWeb
ca6826f3ba Fix incorrect height between sort tabs and ruleset toggle buttons 2017-05-18 17:12:57 -03:00
DrabWeb
c8102db780 Fix visual test crash 2017-05-18 16:54:50 -03:00
DrabWeb
065f4faa70 Fix ruleset toggle buttons not updating when changing from the toolbar 2017-05-18 16:34:34 -03:00
DrabWeb
0b480fe327 ModeToggleButton -> RulesetToggleButton 2017-05-18 16:17:16 -03:00
DrabWeb
c2880676db Added displaying sets 2017-05-18 16:15:49 -03:00
DrabWeb
c3fb1ab7c6 Mapper -> Author, use BeatmapSetInfo for metadata 2017-05-18 15:01:01 -03:00
DrabWeb
ab1401054d Added result counts (visually) 2017-05-18 14:08:14 -03:00
DrabWeb
9f36a39c59 More cleanup 2017-05-18 13:57:19 -03:00
Jorolf
0e3fb55d5e usage of constant and formatting 2017-05-18 17:02:11 +02: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
Huo Yaoyuan
ff5854d6bf Merge branch 'master' into generic-interface 2017-05-18 19:19:40 +08:00
Dean Herbert
ae676b48b2 Fix whitespace 2017-05-18 19:51:45 +09:00
Dan Balasescu
e52b87bc58 Fix incorrect comment. 2017-05-18 19:47:16 +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
Dan Balasescu
b5674c8f30 Update DistanceObjectPatternGenerator.cs 2017-05-18 19:33:02 +09:00