RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,190 Commits 3 Branches 659 Tags 364 MiB
Commit Graph

229 Commits

Author SHA1 Message Date
Dean Herbert fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
John Neijzen 9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
smoogipooo e529ced131 Fix mania-specific beatmaps not setting samples correctly. 2017-05-29 16:18:01 +09:00
smoogipooo 3f4cbd02cd Fix warnings. 2017-05-26 16:29:20 +09:00
smoogipooo 946cd4bfa3 General cleanup + more xmldocs. 2017-05-24 21:57:38 +09:00
smoogipooo dcf879687d Implement basic hold note + tick input. 2017-05-24 20:45:01 +09:00
smoogipooo 836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo ea4a285329 Fix compile errors. 2017-05-23 14:08:15 +09:00
smoogipooo 3cdfd2eef5 Split ControlPoint into different types. 
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
 2017-05-23 14:03:40 +09:00
smoogipooo 7314a9019c Fix nullref. 2017-05-22 16:39:30 +09:00
smoogipooo f70bfd5378 CI fixes. 2017-05-22 13:43:53 +09:00
Dan Balasescu 4556ead3b6 Merge branch 'master' into mania-hitobject-object-conversion 2017-05-22 12:54:06 +09:00
Dean Herbert b50f9cad44 Merge branch 'master' into mania-endtime-object-conversion 2017-05-22 12:14:53 +09:00
Dan Balasescu d02aaf0a28 Merge branch 'master' into mania-distance-object-conversion 2017-05-22 11:36:36 +09:00
smoogipooo 8077ddf944 Update with pattern changes. 2017-05-22 10:34:12 +09:00
smoogipooo 7d417e4219 Merge remote-tracking branch 'smoogipooo/mania-pattern-changes' into mania-hitobject-object-conversion 2017-05-22 10:32:32 +09:00
smoogipooo dba9dd3509 Remove siblings. 2017-05-22 10:30:03 +09:00
smoogipooo e232968ea7 Fix line endings resulting in CI error. 2017-05-22 10:25:28 +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
smoogipooo 3041b55aac Remove siblings. 2017-05-22 09:50:36 +09:00
smoogipooo ecf81fa8d2 Cleanup. 2017-05-22 08:25:48 +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
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
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 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 eae4f8b412 Fix compilation due to previously-removed function. 2017-05-18 18:11:09 +09:00
smoogipooo 2af025e630 Add IHasDistance object pattern generation. 2017-05-18 18:09:13 +09:00
smoogipooo afd3eb4b8d Implement things a bit more to remove warnings. 2017-05-18 18:04:32 +09:00
smoogipooo 873ff34487 This function can't be used for all pattern generations. So let's not use it. 2017-05-18 17:43:59 +09:00
smoogipooo af34777f44 Trim whitespace. 2017-05-18 17:00:11 +09:00
smoogipooo 164a1bb743 Remove distance object pattern generator for now (next PR). 2017-05-18 15:38:15 +09:00
smoogipooo 1fa1897d71 Define the concept of patterns + additional comments. 2017-05-18 15:05:45 +09:00
smoogipooo 618c162535 Move more functions to ObjectConversion + resharper cleanup. 2017-05-18 14:17:23 +09:00
smoogipooo de8271ad6b Fix out of range exceptions due to out-of-order hitobjects. 2017-05-18 14:08:48 +09:00
smoogipooo 6dae5cbacf Fix distance object conversion not calculating end time. 2017-05-18 14:08:32 +09:00
smoogipooo 7c48fb2b92 General fixes. 2017-05-18 13:37:22 +09:00
smoogipooo c1a44ea6b4 Renaming + commenting. 2017-05-18 13:25:55 +09:00
smoogipooo 16eda2467f Make compile. 2017-05-18 12:50:12 +09:00
smoogipooo f6dc85c2f8 Fix incorrect note count probabilities. 2017-05-18 12:39:51 +09:00
smoogipooo e9275138e1 Finish up DistanceObjectConversion. 2017-05-18 12:39:37 +09:00
smoogipooo 22128f158c Fix a few errors. 2017-05-18 12:10:01 +09:00
smoogipooo b52ec11260 Add (almost finished) basis of slider hit object conversion... 2017-05-17 20:47:02 +09:00
smoogipooo 2f8556a44a Fix hold notes + make it compile again. 2017-05-17 13:20:33 +09:00
smoogipooo fdd98e23bd Fix generation. 2017-05-17 13:08:59 +09:00
smoogipooo 1ded043778 Add basic mania-specific beatmap conversion. 
# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
 2017-05-17 13:07:56 +09:00
smoogipooo 0597a95db0 Resharper is too smart. 2017-05-11 22:17:10 +09:00
smoogipooo a6b71f8ccb Resharper fixes. 2017-05-11 14:11:52 +09:00
smoogipooo 185e98aa14 Add basic column conversion to ManiaBeatmapConverter. 2017-05-11 12:32:30 +09:00
smoogipooo bcc8a94e36 Construct mania playfield with proper column count. 2017-05-10 16:32:11 +09:00
smoogipooo 5328793693 ManiaBaseHit -> ManiaHitObject. 2017-05-03 12:44:19 +09:00
Dean Herbert fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00