943 Commits

Author	SHA1	Message	Date
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
smoogipoo	0bc2bcaf14	Remove GetAspectAdjustedSize() and PlayfieldArea	2018-09-21 15:14:49 +09:00
smoogipoo	368ceec47c	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00
Dean Herbert	ced6e5efd0	Synchronise animation; reduce flashiness	2018-09-07 17:17:03 +09:00
Dean Herbert	1e39b84089	Increase visibility of osu!mania long notes	2018-09-06 23:49:54 +09:00
Dean Herbert	68a79f895a	Fix mania throwing an exception on start of map	2018-08-30 14:58:00 +09:00
smoogipoo	49913f00f0	Fix xmldoc	2018-08-25 00:07:48 +09:00
smoogipoo	26dfabc86c	Aggressively check for valid columns before iterating endlessly	2018-08-24 23:57:44 +09:00
smoogipoo	6475dfaeef	Allow 2B maps to be converted to mania	2018-08-23 09:19:33 +09:00
Dean Herbert	786ed8203f	Merge branch 'master' into fix-mirror-note-conversion	2018-08-17 14:47:16 +09:00
smoogipoo	3d6721111a	Increase the maximum allowable iterations during mania conversion	2018-08-17 13:26:53 +09:00
smoogipoo	99ace9805f	Fix mirror note generation never completing	2018-08-17 12:54:32 +09:00
Dean Herbert	dfecb3235b	Fix custom exception stack trace output	2018-08-16 20:41:53 +09:00
Dean Herbert	b26c8e3b9e	Fix notifiation stack trace output on mania conversion failure	2018-08-16 14:04:48 +09:00
Dean Herbert	6cc6d77815	Merge branch 'master' into mania-conversion-safety	2018-08-16 11:19:14 +09:00
smoogipoo	74a79bfcfa	Fix hold note head/tails not being nested hitobjects	2018-08-16 10:45:06 +09:00
Dean Herbert	d28acaada1	Merge branch 'master' into mania-conversion-safety	2018-08-16 10:37:07 +09:00
smoogipoo	26d4bb5451	xmldoc + reword	2018-08-15 09:51:02 +09:00
smoogipoo	2019a89a08	Softly-handle infinite loops in mania beatmap conversion	2018-08-14 16:45:35 +09:00
Dean Herbert	270dc2d1be	Merge branch 'master' into judgement-rework	2018-08-14 13:16:16 +09:00
smoogipoo	f719b9bef5	Fix mania scroll direction not being read from database	2018-08-07 12:20:24 +09:00
Dan Balasescu	c1517e1521	Merge branch 'master' into judgement-rework	2018-08-06 12:30:46 +09:00
smoogipoo	3a7488767c	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
smoogipoo	741ec0021e	Rename more judgement-related methods to "result"	2018-08-06 11:31:46 +09:00
smoogipoo	5fd4ed2f4e	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +09:00
Dean Herbert	0c920fe486	Merge branch 'master' into mania-mask-container	2018-08-06 04:22:21 +09:00
smoogipoo	2a4994e5ce	Make hitobjects only have one judgement + result	2018-08-03 15:38:48 +09:00
smoogipoo	807794d512	Make Rulesets.Mania use the new judgement result structure	2018-08-02 20:36:54 +09:00
smoogipoo	cd70e5e30b	Migrate Rulesets.Mania to the new judgement system	2018-08-02 16:44:01 +09:00
Dean Herbert	3c06655672	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
Dean Herbert	aead4be134	Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container	2018-07-23 06:36:10 +02:00
Dean Herbert	d868d81b59	Merge branch 'master' into centralise-judgement-display	2018-07-23 02:58:49 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
smoogipoo	1139f0dbf2	Centralise method of disabling playfield judgements	2018-07-20 17:04:33 +09:00
Dan Balasescu	824c217a0d	Adjust comment	2018-07-19 19:46:03 +09:00
Dan Balasescu	5dba048c46	Merge branch 'master' into mania-mask-container	2018-07-19 19:38:43 +09:00
smoogipoo	c3c270621b	Fix hold note note masks blocking mouse input	2018-07-19 19:32:47 +09:00
smoogipoo	be297ddf76	Fix direction reversal not quite working correctly	2018-07-19 19:30:20 +09:00
smoogipoo	b7721edc80	Remove more unnecessary changes	2018-07-19 18:25:28 +09:00
smoogipoo	54e288f09b	Correctly give note masks a scrolling info	2018-07-17 16:55:50 +09:00
smoogipoo	6437fdd9db	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-07-17 16:46:48 +09:00
Dan Balasescu	64cde1ebad	Merge branch 'master' into use-switch-over-if	2018-07-17 16:44:57 +09:00
smoogipoo	c51fe6a119	Remove more unused stuff	2018-07-17 16:01:47 +09:00
smoogipoo	48c1561676	Remove now unnecessary mask layer	2018-07-17 16:01:14 +09:00
smoogipoo	9f730dd784	Merge branch 'editor-composer-cleanup' into mania-mask-container ... # Conflicts: # osu.Game/Rulesets/Edit/HitObjectComposer.cs # osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs	2018-07-17 16:00:46 +09:00
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +09:00
Dean Herbert	825941aff1	Use switch with type matching in place of if-else where possible	2018-07-17 14:35:09 +09:00
smoogipoo	577ff4cc7f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Mania/UI/ManiaStage.cs	2018-07-17 13:13:57 +09:00
Dean Herbert	58fe434dd0	Don't use in invalidation logic to avoid incorrect execution	2018-07-16 16:39:52 +09:00
Dean Herbert	98cddc0c04	Fix some legacy cases	2018-07-16 16:26:37 +09:00
Dean Herbert	dbc538abbe	Use Enum.HasFlag ... With .NET core 2.0+ this is as efficient as the ugly code we've been using.	2018-07-16 16:18:46 +09:00
Dean Herbert	24054246b8	Fix DI regression	2018-07-11 17:54:01 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
Dan Balasescu	282a99fb88	Merge branch 'master' into fix-spelling	2018-07-10 16:32:14 +09:00
Dan Balasescu	a1d2092cc9	Fix incorrect default drain time	2018-07-06 13:29:40 +09:00
Dan Balasescu	290812cf65	Merge branch 'master' into more-mania-conversion-fixes	2018-07-06 13:29:16 +09:00
Dean Herbert	1d6609d9f3	Add common custom words to dotsettings dictionary ... Also fixes some typos and reduces spelling suggestions to hints.	2018-07-05 15:54:41 +09:00
smoogipoo	f007e71c87	Retrieve the mania key action through DI	2018-07-02 12:31:41 +09:00
Dean Herbert	c0b65a6a73	Change default IsBonus definition and remove unnecessary overrides	2018-06-29 17:07:08 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
Dean Herbert	22138d39ca	Merge branch 'master' into more-diffcalc-attributes	2018-06-25 19:53:22 +09:00
Dean Herbert	a397827841	Reduce line length	2018-06-25 19:28:38 +09:00
Dean Herbert	594cc0d21d	Merge branch 'master' into mania-playfield-inversions	2018-06-25 18:36:23 +09:00
smoogipoo	97057ced85	Merge remote-tracking branch 'origin/master' into full-mania-fix	2018-06-25 12:43:49 +09:00
Jean-Denis Boivin	55364af56c	I guess you meant an "or" ?	2018-06-24 14:55:27 -04:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
smoogipoo	48989df6eb	Make sure that 0 SR is returned when there are no hitobjects	2018-06-21 12:04:14 +09:00
Dan Balasescu	bf11a61d52	Merge branch 'master' into more-diffcalc-attributes	2018-06-21 09:26:50 +09:00
smoogipoo	6cd9a22e26	Update testcase	2018-06-19 13:52:24 +09:00
smoogipoo	a623155b9f	Fix missing using	2018-06-19 13:51:53 +09:00
smoogipoo	f090e82b63	Fix inverted conditional	2018-06-18 21:06:09 +09:00
smoogipoo	0625bfda30	Don't split single hitobject into multiple patterns	2018-06-18 20:17:49 +09:00
smoogipoo	8529cece4a	Fix precision error	2018-06-18 20:17:19 +09:00
Dean Herbert	1d9d240454	Merge branch 'master' into mania-playfield-inversions	2018-06-18 04:41:17 +09:00
Dean Herbert	6fa72c510f	Avoid listing the base mods twice	2018-06-18 00:48:35 +09:00
smoogipoo	0a99d21938	Use the passed-in ruleset	2018-06-17 18:01:28 +09:00
smoogipoo	55f0b3c42c	Distance object generator should output a secondary pattern ... In osu!stable, only the hitobjects which ended at the distance object's EndTime would be considered for further pattern generation. Previously this generator was group _all_ objects including those that don't end at the object's EndTime, resulting in incorrect hitobject count for further pattern generation.	2018-06-15 22:10:57 +09:00
smoogipoo	2d59ae9354	Commit forgotten variable	2018-06-15 22:08:24 +09:00
smoogipoo	53a6d01304	Fix stair type not being flipped correctly	2018-06-15 21:06:54 +09:00
smoogipoo	5f5d797c1e	Remove unused field	2018-06-15 21:06:35 +09:00
smoogipoo	e51f96e181	Fix some notes not being recorded	2018-06-15 20:53:18 +09:00
smoogipoo	c1f7db80f1	Forgot to commit random change	2018-06-15 20:52:09 +09:00
smoogipoo	fe9aaf000c	Fix missing conditional	2018-06-15 20:50:36 +09:00
smoogipoo	481546ec7a	Fix drain time not being rounded to the second	2018-06-15 20:49:11 +09:00
smoogipoo	afbf35b814	Add rng components to mania conversion tests	2018-06-15 20:48:48 +09:00
Dean Herbert	57011ff13b	Merge branch 'master' into mania-playfield-inversions	2018-06-15 18:33:40 +09:00
Dean Herbert	719056ca4a	Merge branch 'master' into mania-keymod-optimisation	2018-06-15 18:29:27 +09:00
Dean Herbert	f9a7e761e4	Merge branch 'master' into more-diffcalc-attributes	2018-06-15 18:29:20 +09:00
Dean Herbert	a6437c005c	Merge branch 'master' into diffcalc-rework	2018-06-15 18:02:18 +09:00
Dean Herbert	30f7837b03	Merge branch 'master' into fix-taiko-hitexplosions	2018-06-15 17:52:53 +09:00
smoogipoo	fd84afb89b	Fix non-inverted calculation	2018-06-14 19:38:48 +09:00
smoogipoo	a3bf16e481	Fix missing convert type	2018-06-14 19:37:32 +09:00
smoogipoo	b25a6a33cc	Fix 1K breaking hitcircle / slider conversions	2018-06-14 19:37:21 +09:00
smoogipoo	08b9cf75e9	Don't compute keymod difficulties for mania-specific beatmaps ... These don't affect the number of keys in the beatmap at all for mania-specific beatmaps.	2018-06-14 17:10:08 +09:00
smoogipoo	22add2abc5	Move mania difficulty attributes to ManiaDifficultyCalculator	2018-06-14 16:25:44 +09:00
smoogipoo	8f7334874c	Fix up performance calculators	2018-06-14 16:04:48 +09:00
smoogipoo	966099fabc	Adjust ManiaDifficultyCalculator in-line with changes	2018-06-14 15:54:05 +09:00
Dean Herbert	ae136e89a4	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
smoogipoo	7651819fb0	Add same change to mania's hit explosions	2018-06-12 12:53:53 +09:00
Dan Balasescu	9994c69d58	Merge branch 'master' into fix-object-ordering	2018-06-11 17:53:33 +09:00
smoogipoo	3bad319dd2	Fix filename	2018-06-11 16:19:57 +09:00
smoogipoo	10d1dfa7cd	A bit of cleanup	2018-06-11 16:10:27 +09:00
smoogipoo	b9bf3a1829	Make mania scroll downwards by default	2018-06-11 15:56:30 +09:00
smoogipoo	162237dc46	Fix bar lines being offset	2018-06-11 15:43:15 +09:00
smoogipoo	f49b7d6e16	Add mania direction to settings	2018-06-11 14:36:19 +09:00
smoogipoo	93696fb5e5	Merge branch 'ruleset-configs' into mania-playfield-inversions ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-06-11 13:46:39 +09:00
smoogipoo	4fb6a8627e	Merge remote-tracking branch 'origin/master' into mania-playfield-inversions	2018-06-11 13:45:47 +09:00
smoogipoo	baaf431b9e	Make IScrollingInfo and store direction as bindable	2018-06-11 13:42:13 +09:00
smoogipoo	ca5103615d	DI the scrolling info rather than pass by ctor	2018-06-11 13:42:13 +09:00
smoogipoo	eca016ec6c	Move ruleset config managers to Ruleset	2018-06-11 13:17:08 +09:00
smoogipoo	22e8a0bb6e	Make ruleset config manager variants nullable	2018-06-11 13:13:36 +09:00
Crusensis	fbc0cd6f5f	Split AffectsCombo into IsBonus	2018-06-09 18:14:33 -07:00
Dean Herbert	aaa65c428f	Merge branch 'master' into diffcalc-modtypes	2018-06-09 23:35:17 +09:00
smoogipoo	0fb4e6b41b	Fix hold note body not following the scroll direction	2018-06-08 18:16:55 +09:00
Dan Balasescu	4dfc328117	Remove unused array	2018-06-08 17:46:38 +09:00
smoogipoo	5c8bea82f8	Fix scroll direction not applying to nested hitobjects	2018-06-08 15:29:08 +09:00
smoogipoo	7deaffdb62	Fix hit explosions not following the scroll direction	2018-06-08 15:24:19 +09:00
smoogipoo	d73c2a1654	Fix various note elements not following the scroll direction	2018-06-08 15:24:19 +09:00
smoogipoo	80a577f182	Fix notes not scrolling correctly	2018-06-08 15:16:45 +09:00
smoogipoo	ee64760406	Add mania stage test case	2018-06-08 14:28:27 +09:00
smoogipoo	32037701bf	Make the column hitobject area follow the scroll direction	2018-06-07 21:40:12 +09:00
smoogipoo	0c35908802	Reorder fields	2018-06-07 21:19:31 +09:00
smoogipoo	207cdbdefe	Make the column key area follow the scroll direction	2018-06-07 21:13:57 +09:00
smoogipoo	11f067d7d6	Fix background input	2018-06-07 21:13:29 +09:00
smoogipoo	d49758d149	Make background handle its own lit state	2018-06-07 20:59:04 +09:00
smoogipoo	4af8baefc1	Make the column background follow the scroll direction	2018-06-07 20:49:31 +09:00
smoogipoo	9b10cc4e0c	Remove invertability of ManiaStage	2018-06-07 19:53:47 +09:00
smoogipoo	ce7a5e8914	Update visual style to match new notes	2018-06-07 19:19:32 +09:00
smoogipoo	55475d129f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 19:19:20 +09:00
smoogipoo	24b314b51f	Fix hold note masks not working	2018-06-07 19:00:02 +09:00
smoogipoo	f299ae0fbd	Fix positioning	2018-06-07 18:59:52 +09:00
smoogipoo	cd532cde2d	Fix note masks not working	2018-06-07 18:28:49 +09:00
smoogipoo	d1b469c1a3	Better handling of nested playfields' hitobjects	2018-06-07 16:28:21 +09:00
smoogipoo	279a2844f0	Actually make ManiaHitObjectComposer constructible/testable	2018-06-07 16:08:37 +09:00
smoogipoo	f715734662	Remove unnecessary csproj edit	2018-06-07 15:57:21 +09:00
smoogipoo	485026da6f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 15:32:31 +09:00
Dan Balasescu	8d0161c2fc	Refactoring	2018-06-07 15:11:48 +09:00
Dean Herbert	f9449e841a	Improve overall visual clarity and explosion effects	2018-06-07 14:30:27 +09:00
Dean Herbert	dff4b360b7	Fix ticks not getting accent colour	2018-06-07 14:30:27 +09:00
Dean Herbert	56ea1c1d63	Adjust hold note visibility and glow composition	2018-06-07 14:30:27 +09:00
Dean Herbert	81a3a8a1a4	Add corner radius	2018-06-07 11:57:30 +09:00
Dean Herbert	dc10277d50	Thicker bar lines and new design colour	2018-06-07 11:16:26 +09:00
smoogipoo	83ff47ec80	Rewrite difficulty mod combinations	2018-06-06 16:20:17 +09:00
Dean Herbert	3567823759	Reverse order of exposed objects in HitObjectContainer ... Closes #2740.	2018-06-06 15:03:47 +09:00
smoogipoo	8274623ad6	Cleanup multi mod constructions	2018-06-06 14:07:50 +09:00
smoogipoo	2ccffb9ac4	Add difficulty calculation mod types	2018-06-03 10:59:56 +09:00
Dean Herbert	2f21b9c4ea	Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits	2018-05-31 12:36:37 +09:00
smoogipoo	31cbec99a1	Fix mania hold notes displaying judgements	2018-05-28 18:12:49 +09:00
smoogipoo	d850e34003	Actually cast to int	2018-05-26 09:25:16 +09:00
smoogipoo	215cc9fba7	Change all performance calculators to use int hitwindows ... Has a pretty large (>6) effect on pp for some maps.	2018-05-25 20:07:14 +09:00