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

96 Commits

Author SHA1 Message Date
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
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
smoogipooo
1f6939f57b Add IHasEndTime object pattern generation. 2017-05-18 19:31:56 +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
af129b3eab Add siblings, will be used in generator branches. 2017-05-18 18:13:08 +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
6010243736 Fix incorrect uint_to_real factor. 2017-05-18 14:07:57 +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
4d9aea6aec Remove while statement (came from fastrandom...). 2017-05-17 13:14:42 +09:00
smoogipooo
9565bb9572 Fix hold notes - remove glow for now.
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
2017-05-17 13:09:49 +09:00
smoogipooo
17466a662c Add hold note conversion. 2017-05-17 13:09:07 +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
51f7904c13 Remove redundant parentheses. 2017-05-17 13:04:57 +09:00
smoogipooo
93e2b21084 Add FastRandom class for use in beatmap conversion. 2017-05-17 12:52:07 +09:00
smoogipooo
0eba553138 Comments? 2017-05-16 19:33:56 +09:00
smoogipooo
bc629d193d InternalChildren -> Children. 2017-05-16 19:26:46 +09:00
smoogipooo
9b0aed7c48 Add tween to time span changing. 2017-05-16 19:14:27 +09:00
smoogipooo
3c8d75effb Fix unused directive. 2017-05-16 18:36:38 +09:00
smoogipooo
6231a19b8c Merge remote-tracking branch 'origin/master' into mania-timing-sections 2017-05-16 18:35:32 +09:00
smoogipooo
be4ff5c038 Fix possible no-children-in-sequence exception. 2017-05-16 18:26:49 +09:00
smoogipooo
620b4bf863 Cleanup. 2017-05-16 18:17:34 +09:00
smoogipooo
60666dc824 Rename. 2017-05-16 18:05:09 +09:00
smoogipooo
f4a03ec1cf Fix usings. 2017-05-16 18:03:30 +09:00
smoogipooo
8ed97a8335 Let's invert the playfield by default for now. 2017-05-16 18:02:54 +09:00
smoogipooo
ac02d1ab10 TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation). 2017-05-16 17:50:09 +09:00
smoogipooo
7039205363 Invert the playfield by default to make calculations a bit simpler and clean up a lot of code. 2017-05-16 17:34:41 +09:00
smoogipooo
62139015fb Clamp TimeSpan. 2017-05-16 17:06:54 +09:00
smoogipooo
8d19bafc19 Add ability to hold down speed-changing keys. 2017-05-16 17:04:05 +09:00