404 Commits

Author	SHA1	Message	Date
Dean Herbert	41d4aee4f5	Update nuget packages ... - [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820	2017-06-13 11:50:46 +09:00
smoogipooo	56244e0134	Add small test case to demonstrate usage.	2017-06-12 17:31:24 +09:00
smoogipooo	ba8014bbd9	Cleanups + xmldoc rewordings/improvements.	2017-06-12 15:20:34 +09:00
smoogipooo	419682b740	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework	2017-06-12 13:09:02 +09:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
smoogipooo	de35ea22b1	Make bar lines work again.	2017-06-09 22:03:28 +09:00
smoogipooo	1f56848442	Rewrite the way speed adjustments are applied.	2017-06-09 19:57:03 +09:00
smoogipooo	921350128d	Rename SpeedAdjustment -> MultiplierControlPoint + reworking.	2017-06-09 16:57:17 +09:00
smoogipooo	4b2669e65d	Namespace movement.	2017-06-09 16:20:55 +09:00
smoogipooo	d11002e499	Use new naming structure + VisibleTimeRange bindable.	2017-06-09 16:11:49 +09:00
smoogipooo	cd435f7ec6	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework # osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs	2017-06-09 03:37:55 +09:00
smoogipooo	8de6bdf340	Rewrite mania to use the new timing section stuff.	2017-06-09 02:43:48 +09:00
smoogipooo	55f238f6a9	Remove IHasTimeSpan, add rename to TimingSection.	2017-06-08 23:40:24 +09:00
Dean Herbert	a454ca606f	Merge remote-tracking branch 'upstream/master' into johnneijzen-master	2017-06-08 20:33:39 +09:00
Tom94	5f7270ee4b	Use new invalidation rules	2017-06-08 09:53:45 +02:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
John Neijzen	9b0e1c26a3	Clean Up Code	2017-06-07 19:53:37 +08:00
smoogipooo	8641379424	Not sure how these CI issues were missed.	2017-06-07 19:27:22 +09:00
smoogipooo	1932b58663	g -> gravity + one more xmldoc.	2017-06-07 19:21:31 +09:00
smoogipooo	1017cf54d9	CI fixes.	2017-06-07 19:17:45 +09:00
smoogipooo	6f191193a1	Rename timing changes, simplify + improve columns/dictionary usage.	2017-06-07 19:15:51 +09:00
smoogipooo	7aee8ee547	Make TimeSpan a double again.	2017-06-07 19:08:32 +09:00
Dean Herbert	5f537780cf	Bring framework up-to-date	2017-06-07 15:32:50 +09:00
smoogipooo	5104e65bcd	Make hold notes utilize RelativeChildOffset for tick positionings.	2017-06-06 15:57:30 +09:00
smoogipooo	e3d10fc4d3	Update with more framework changes.	2017-06-06 15:52:35 +09:00
smoogipooo	4307242bb6	Update with framework changes.	2017-06-05 20:06:46 +09:00
smoogipooo	a3299809fe	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs	2017-06-05 10:19:53 +09:00
smoogipooo	d66f114b5b	Properly set starting lifetime for mania hit objects.	2017-06-03 18:18:25 +09:00
smoogipooo	7022c8d496	Move timing change stuff to osu.Game project.	2017-06-02 20:17:44 +09:00
smoogipooo	e5720b9477	CI fixes.	2017-06-02 19:53:30 +09:00
smoogipooo	d6e49b94ec	Add comment.	2017-06-02 19:36:47 +09:00
smoogipooo	c7dcb54d45	Simplify gravity.	2017-06-02 19:34:55 +09:00
smoogipooo	a4cd409835	Super huge abstraction changes to (hopefully) make this TimingChangeContainer usable for non-mania rulesets. ... Also includes commenting improvements/fixes.	2017-06-02 19:27:22 +09:00
smoogipooo	186fecca82	Add missing license headers.	2017-06-02 18:20:14 +09:00
smoogipooo	1d3f5d8649	CI fixes.	2017-06-02 18:19:21 +09:00
smoogipooo	97dd80b874	Make life time set after children are updated (for now).	2017-06-02 18:11:36 +09:00
smoogipooo	5ebe08ed2a	Make default mania playfield timespan 1.5s for now.	2017-06-02 17:45:48 +09:00
smoogipooo	519f5f785b	Add gravity mod icon.	2017-06-02 17:43:24 +09:00
smoogipooo	b46a9dd0ef	Add gravity mod.	2017-06-02 17:33:58 +09:00
smoogipooo	8f6118ffb8	Set lifetime for timing change containers very naively for now.	2017-06-02 16:39:31 +09:00
smoogipooo	1eddc278a4	Cleanup + make travel time equal to the time span.	2017-06-02 16:04:14 +09:00
smoogipooo	563f746acf	Add gravity timing change.	2017-06-02 15:30:59 +09:00
smoogipooo	d75bbb2b88	Fix incorrect sorting.	2017-06-02 15:28:30 +09:00
smoogipooo	1da5d508fa	aaaaa	2017-06-02 11:35:51 +09:00
smoogipooo	d30706f640	Move drawable timing changes to Timing/Drawables.	2017-06-01 15:13:52 +09:00
smoogipooo	3e2aa26722	Add bar line timing changes.	2017-06-01 15:08:41 +09:00
smoogipooo	f612914e87	Initial rewrite of timing changes to allow them to be more extensible.	2017-06-01 14:26:21 +09:00
Shawdooow	cb5fcf2572	change mania multiplier	2017-05-30 13:27:10 -04:00
Shawdooow	ecc0d0b11c	Daycore mod	2017-05-30 12:49:06 -04:00
Dean Herbert	476526714d	Merge branch 'master' into mania-judgements	2017-05-29 21:31:48 +09:00
Dean Herbert	a0c542f461	Merge branch 'master' into mania-barlines	2017-05-29 20:36:50 +09:00
smoogipooo	e529ced131	Fix mania-specific beatmaps not setting samples correctly.	2017-05-29 16:18:01 +09:00
smoogipooo	586fc782cf	Fix line endings.	2017-05-29 16:00:14 +09:00
Dan Balasescu	0327adcba8	Update HoldNote.cs	2017-05-29 15:35:50 +09:00
smoogipooo	4b6f2efa76	Cleanups.	2017-05-29 15:32:58 +09:00
smoogipooo	32550bda4f	Make drawable bar line a bit more sane.	2017-05-29 15:18:06 +09:00
smoogipooo	4fce0c1189	Rename Barline -> BarLine.	2017-05-29 15:05:20 +09:00
smoogipooo	44f1d906ea	Store tick count locally, remove HoldNote TickCount.	2017-05-29 14:47:51 +09:00
smoogipooo	ee7158aa95	Implement bar lines.	2017-05-29 14:44:42 +09:00
smoogipooo	e63108bd75	Add base for bar lines.	2017-05-29 11:56:31 +09:00
smoogipooo	f17b8acd13	Remove erroneous tab.	2017-05-29 11:45:16 +09:00
smoogipooo	e5e73b31b6	Cleanup + slight xmldoc improvements.	2017-05-29 11:42:43 +09:00
smoogipooo	79cdba58c1	Merge branch 'mania-holdnote-input' into mania-judgements	2017-05-29 11:23:32 +09:00
smoogipooo	cdf4fcea02	Fix input being reversed.	2017-05-29 11:07:17 +09:00
smoogipooo	b28b7af887	Scale HP with drain rate a bit.	2017-05-26 20:42:03 +09:00
smoogipooo	3715171948	Ticks can't be missed.	2017-05-26 20:32:21 +09:00
smoogipooo	ca08011734	Add basic (new) hp calculations.	2017-05-26 20:26:26 +09:00
smoogipooo	95908af677	Fix resetting scoreprocessor.	2017-05-26 20:26:06 +09:00
smoogipooo	10f62eb8da	Fix incorrect combo score.	2017-05-26 20:25:24 +09:00
smoogipooo	ab5e1bfc89	Add basic score calculations.	2017-05-26 19:56:50 +09:00
smoogipooo	9ec6e0b692	Fix hold note ticks changing combo.	2017-05-26 19:56:35 +09:00
smoogipooo	02f582a3f8	Add hold note tick judgement.	2017-05-26 19:29:47 +09:00
smoogipooo	4c67c13410	Add hold note tail judgement.	2017-05-26 19:28:14 +09:00
smoogipooo	43a7923199	Implement base mania judgement score.	2017-05-26 19:22:17 +09:00
smoogipooo	f294fef29b	Remove holding property in favor of a nullable hold start time.	2017-05-26 18:56:21 +09:00
smoogipooo	e4b59314ea	Use new HitObjectStartTimeComparer.	2017-05-26 18:52:43 +09:00
smoogipooo	871d44d628	Renamings.	2017-05-26 16:39:43 +09:00
smoogipooo	3f4cbd02cd	Fix warnings.	2017-05-26 16:29:20 +09:00
smoogipooo	47e1b7b389	Fix tick construction loop.	2017-05-26 16:28:39 +09:00
smoogipooo	d3206396e7	Rewrite comments.	2017-05-26 16:10:04 +09:00
smoogipooo	c2d3b6c05a	Remove late initialization of head + tail, keep them updated with start time and end time.	2017-05-26 15:53:49 +09:00
smoogipooo	946cd4bfa3	General cleanup + more xmldocs.	2017-05-24 21:57:38 +09:00
smoogipooo	a5b79b2192	Fix notes not getting accent colours.	2017-05-24 21:56:49 +09:00
smoogipooo	ed65b3559a	CI fix.	2017-05-24 21:25:01 +09:00
smoogipooo	21cdee02f3	Get tickSpacing from beatmap.	2017-05-24 21:24:33 +09:00
smoogipooo	d6b104d794	Minor visual change for DrawableHoldNoteTick.	2017-05-24 21:24:18 +09:00
smoogipooo	78067e085c	Fix note input ordering.	2017-05-24 20:53:47 +09:00
smoogipooo	dcf879687d	Implement basic hold note + tick input.	2017-05-24 20:45:01 +09:00
Dean Herbert	0842e00f13	Merge branch 'master' into controlpoint-rework	2017-05-24 00:20:15 +09:00
Dean Herbert	836c33cfb0	Merge branch 'master' into mania-note-input	2017-05-23 16:50:01 +09:00
smoogipooo	a4823bca91	CI fixes.	2017-05-23 16:47:47 +09:00
smoogipooo	7e5bb61a44	Fix line endings.	2017-05-23 16:13:51 +09:00
smoogipooo	836bf930a0	More cleanups.	2017-05-23 15:29:38 +09:00
smoogipooo	002a0e99a2	Use SortedList + BinarySearch to find control points at time values.	2017-05-23 15:20:32 +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
Dean Herbert	51728e48be	Merge branch 'master' into mania-hitobject-object-conversion	2017-05-22 21:12:00 +09:00
smoogipooo	4200e05fe7	Don't handle repeat keys.	2017-05-22 16:42:14 +09:00
smoogipooo	7314a9019c	Fix nullref.	2017-05-22 16:39:30 +09:00
smoogipooo	f9eb448f16	Implement DrawableNote hits.	2017-05-22 16:35:15 +09:00
Dan Balasescu	6f00f7f0d0	Update HitWindows.cs	2017-05-22 16:34:38 +09:00
smoogipooo	62c7e97a5f	Add helper method to easily compare time offset to hit windows.	2017-05-22 16:28:44 +09:00
smoogipooo	0f3cf18345	Forgot license header.	2017-05-22 16:15:52 +09:00
smoogipooo	9a578e036e	Add xmldoc.	2017-05-22 16:09:32 +09:00
smoogipooo	60e036b5f4	Fix missing reference.	2017-05-22 15:29:02 +09:00
smoogipooo	dcf3148d23	Fix osu!mania failing due to 0 hp.	2017-05-22 15:28:51 +09:00
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
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
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	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	6c0d226459	Merge branch 'remove-siblings' into mania-hitobject-object-conversion	2017-05-22 10:25:59 +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
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	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
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
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	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
Huo Yaoyuan	88f8619e9a	More missed exceptions.	2017-05-18 02:46:12 +08: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	c5d823d7d9	Remove redundant parentheses.	2017-05-17 13:11:17 +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