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

137 Commits

Author SHA1 Message Date
smoogipooo
3dfe88c068 Make Key a bindable, pass down to drawable hit objects. 2017-05-22 15:28:30 +09:00
smoogipooo
c972335297 Add InputTarget to capture input from columns before hit objects. 2017-05-22 15:25:37 +09:00
smoogipooo
409464381c Expose HitWindows so they're accessible from the drawable hit objects. 2017-05-22 14:11:14 +09:00
smoogipooo
d0ddd62f84 Add ManiaHitResult to ManiaJudgement. 2017-05-22 14:10:53 +09:00
Dean Herbert
b50f9cad44 Merge branch 'master' into mania-endtime-object-conversion 2017-05-22 12:14:53 +09:00
Dean Herbert
fe70641980 Merge branch 'master' into mania-distance-object-conversion 2017-05-22 12:08:01 +09:00
Dan Balasescu
d02aaf0a28 Merge branch 'master' into mania-distance-object-conversion 2017-05-22 11:36:36 +09:00
Dean Herbert
7f08d60008 Merge branch 'master' into generic-interface 2017-05-22 11:35:50 +09:00
Dean Herbert
469cc5fa52 Merge branch 'master' into remove-siblings 2017-05-22 11:18:46 +09:00
smoogipooo
6714a244e8 Add check before possibly going into endless loop. 2017-05-22 10:23:08 +09:00
smoogipooo
2d11a8bdf0 Update with pattern changes. 2017-05-22 10:20:42 +09:00
Dan Balasescu
4ce3a78066 Update Pattern.cs 2017-05-22 10:18:42 +09:00
smoogipooo
e9f7be8dce Merge branch 'mania-pattern-changes' into mania-endtime-object-conversion 2017-05-22 10:17:54 +09:00
smoogipooo
cd66e2af14 Update with pattern changes. 2017-05-22 10:17:08 +09:00
smoogipooo
9fd4ab2302 Merge branch 'mania-pattern-changes' into mania-distance-object-conversion 2017-05-22 10:14:32 +09:00
smoogipooo
0a0139aded Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod. 2017-05-22 10:12:33 +09:00
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
smoogipooo
9f2ca1acbf Remove siblings. 2017-05-22 09:57:03 +09:00
Dean Herbert
93182e5da3 Merge branch 'master' into generic-interface 2017-05-22 09:52:40 +09:00
smoogipooo
f42cbd5f38 Merge branch 'remove-siblings' into mania-endtime-object-conversion 2017-05-22 09:51:36 +09:00
smoogipooo
3041b55aac Remove siblings. 2017-05-22 09:50:36 +09:00
smoogipooo
384295bdca Merge branch 'remove-siblings' into mania-distance-object-conversion 2017-05-22 09:49:00 +09:00
smoogipooo
e58ffbd87d Remove Note Siblings. 2017-05-22 09:46:34 +09:00
smoogipooo
ecf81fa8d2 Cleanup. 2017-05-22 08:25:48 +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
smoogipooo
9191c4f3e3 Remove LegacyBeatmapConverter. 2017-05-19 16:31:56 +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
Huo Yaoyuan
ff5854d6bf Merge branch 'master' into generic-interface 2017-05-18 19:19:40 +08:00
Dan Balasescu
e52b87bc58 Fix incorrect comment. 2017-05-18 19:47:16 +09:00
Dan Balasescu
b5674c8f30 Update DistanceObjectPatternGenerator.cs 2017-05-18 19:33:02 +09:00
smoogipooo
1f6939f57b Add IHasEndTime object pattern generation. 2017-05-18 19:31:56 +09:00
smoogipooo
a239411808 Fix warnings/errors. 2017-05-18 19:10:32 +09:00
smoogipooo
78453c7ce3 Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
2017-05-18 19:06:27 +09:00
smoogipooo
4e8ead9cf4 Fix possible nullref. 2017-05-18 19:05:03 +09:00
smoogipooo
c80e2e8f0a Attempt to solve warnings... 2017-05-18 18:46:50 +09:00
smoogipooo
35bd608a4a Simplify method parameters, make conversion work again. 2017-05-18 18:41:44 +09:00
smoogipooo
a30e49d21b Add hold end samples. 2017-05-18 18:19:29 +09:00
smoogipooo
53a2f34f8b Set siblings, removing warning. 2017-05-18 18:15:09 +09:00
smoogipooo
2c97313a20 Merge branch 'mania-beatmap-conversion' into mania-distance-object-conversion 2017-05-18 18:14:11 +09:00
smoogipooo
af129b3eab Add siblings, will be used in generator branches. 2017-05-18 18:13:08 +09:00
smoogipooo
eae4f8b412 Fix compilation due to previously-removed function. 2017-05-18 18:11:09 +09:00