968 Commits

Author	SHA1	Message	Date
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
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
smoogipooo	da932276e8	Make timing sections scroll again.	2017-05-16 17:03:43 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
smoogipooo	a25f11e809	Initial removal of TimingSection.	2017-05-12 22:23:32 +09:00
smoogipooo	0597a95db0	Resharper is too smart.	2017-05-11 22:17:10 +09:00
smoogipooo	d57bb7e5fd	General cleanups.	2017-05-11 22:01:37 +09:00
smoogipooo	7b49ed1419	Fix up todo.	2017-05-11 21:57:28 +09:00
smoogipooo	f764ed8903	Remove unused class.	2017-05-11 20:05:11 +09:00
smoogipooo	0739a76497	Make the playfield work in TestCaseGamefield.	2017-05-11 20:04:45 +09:00
smoogipooo	ee219c18db	Make the playfield mask for now.	2017-05-11 20:04:28 +09:00
smoogipooo	6a79c8b66c	Make notes scroll with beat length.	2017-05-11 19:57:24 +09:00
smoogipooo	5dd83067ee	Fix line endings.	2017-05-11 17:41:00 +09:00
smoogipooo	5f30a89f76	General refactoring + renaming of TimingSectionContainer.	2017-05-11 16:09:48 +09:00
smoogipooo	da4be2f9d6	Move notes above judgement area but below keys.	2017-05-11 14:32:31 +09:00
smoogipooo	623912b40a	Fix playfield position.	2017-05-11 14:32:13 +09:00
smoogipooo	f6677125af	Merge branch 'mania-notes' into mania-timing-sections	2017-05-11 14:11:58 +09:00
smoogipooo	a6b71f8ccb	Resharper fixes.	2017-05-11 14:11:52 +09:00
smoogipooo	cdf827df8e	CI fixes.	2017-05-11 13:55:52 +09:00
smoogipooo	7fcbf2d8d4	Add t=0 display to notes.	2017-05-11 12:57:07 +09:00
smoogipooo	8160f36a48	Fix notes scrolling from end of map -> start of map.	2017-05-11 12:56:51 +09:00
smoogipooo	b10df74079	Full rewrite of timing section code, partially working for now.	2017-05-11 12:33:19 +09:00
smoogipooo	185e98aa14	Add basic column conversion to ManiaBeatmapConverter.	2017-05-11 12:32:30 +09:00
smoogipooo	2867606913	Whoops wrong project.	2017-05-10 17:35:00 +09:00
smoogipooo	3b533de8ac	Add xmldoc to HitWindows.cs.	2017-05-10 17:29:54 +09:00
smoogipooo	bcc8a94e36	Construct mania playfield with proper column count.	2017-05-10 16:32:11 +09:00
smoogipooo	2edc39ae16	Add timing sections.	2017-05-10 15:09:29 +09:00
smoogipooo	5b323ad483	Cleanups.	2017-05-09 20:55:20 +09:00
smoogipooo	d852567d1d	Rewrite notes to have time-relative position and length.	2017-05-09 20:33:59 +09:00
smoogipooo	e3b01e7b8c	Merge branch 'master' into mania-notes ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2017-05-08 12:12:40 +09:00
EVAST9919	66c858030a	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-04 17:35:41 +03:00
smoogipooo	4ad3e3d64e	Basic implementation of hold notes (not finalized yet).	2017-05-04 18:02:43 +09:00
smoogipooo	f945c636c2	Make note accent colour work again.	2017-05-04 15:36:37 +09:00
smoogipooo	72b2467e74	Throw exception if SpecialColumnPosition is set after IsLoaded.	2017-05-04 15:18:20 +09:00
smoogipooo	e307b6d563	Make SpecialColumnPosition only have an effect during load().	2017-05-04 15:12:32 +09:00
smoogipooo	a2bdd020e5	ColumnStyle -> ColumnPosition.	2017-05-04 14:54:31 +09:00
smoogipooo	956a7288fb	Add basic DrawableNote.	2017-05-03 20:12:27 +09:00
Dan Balasescu	5024a74192	Update ManiaPlayfield.cs	2017-05-03 20:11:24 +09:00
smoogipooo	8aa6bb636c	Reset column key when it can't be set.	2017-05-03 19:43:20 +09:00
smoogipooo	14e4714f08	Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns.	2017-05-03 19:38:15 +09:00
smoogipooo	d11e5d0060	Add hit windows to Note/HoldNote.	2017-05-03 13:51:44 +09:00
Dan Balasescu	d21c3358b9	Less array explicivity.	2017-05-03 13:03:46 +09:00
smoogipooo	7de36b7aa2	CI cleanups.	2017-05-03 12:58:46 +09:00
smoogipooo	5328793693	ManiaBaseHit -> ManiaHitObject.	2017-05-03 12:44:19 +09:00
smoogipooo	64c677a29d	Add IHasColumn.	2017-05-03 12:42:37 +09:00
smoogipooo	71acf1c57d	Move classes out of test case.	2017-05-03 12:37:47 +09:00
EVAST9919	00a8dbbacf	Added ModType for each mode	2017-05-02 21:36:55 +03:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00