496 Commits

Author	SHA1	Message	Date
Huo Yaoyuan	a42f9447e6	Don't use Equals(object) on T?.	2019-12-03 20:07:22 +08:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Dean Herbert	fbebbab5db	Remove excess parenthesis	2019-11-25 22:37:07 +09:00
Dean Herbert	709ec1404f	Centralise End/StartTime retrieval to extension method	2019-11-25 19:09:14 +09:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Huo Yaoyuan	144812669d	Use static local functions.	2019-11-12 19:56:54 +08:00
Huo Yaoyuan	dcfa98414f	Use ??=.	2019-11-12 19:56:51 +08:00
Huo Yaoyuan	31cc0d13da	Use 'out var'.	2019-11-12 19:55:26 +08:00
Dean Herbert	758c304d92	Merge branch 'master' into fallback-to-skin-combo-colours	2019-11-12 19:00:05 +09:00
smoogipoo	3f8928ca25	Suppress warnings	2019-11-12 13:41:54 +09:00
Dean Herbert	b37bf4ea01	Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition	2019-11-12 10:44:53 +09:00
Huo Yaoyuan	e9b8cbb516	Apply other styles.	2019-11-11 20:27:04 +08:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
smoogipoo	b4cb4c1243	Remove previous samples on change	2019-11-08 16:19:55 +09:00
smoogipoo	a9b4106075	Remove unnecessary (for now) scheduling	2019-11-08 16:19:43 +09:00
smoogipoo	53e6186b6d	Fix drawable hitobject samples not updating	2019-11-08 14:59:47 +09:00
smoogipoo	6fc1be64c2	Make hitobject samples a bindable list	2019-11-08 14:04:57 +09:00
iiSaLMaN	cee16e9419	Merge remote-tracking branch 'refs/remotes/upstream/master' into fallback-to-skin-combo-colours	2019-11-07 19:11:29 +03:00
iiSaLMaN	808543885f	Change ComboColours type to IReadOnlyList<Color4> ... Also exposes functions to modify the internal list (AddComboColours, ClearComboColours)	2019-11-07 15:54:30 +03:00
Dean Herbert	e3fa5f1da3	Merge branch 'master' into beatsnap-grid-integration	2019-10-21 18:44:34 +09:00
Dean Herbert	9f004186d5	Ensure DrawableHitObject's HitObject is not null	2019-10-21 17:56:39 +09:00
Dean Herbert	b157aaead1	Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration	2019-10-21 17:09:43 +09:00
smoogipoo	dc222b5e4d	Add common path for duplicated code	2019-10-21 13:52:55 +09:00
Dean Herbert	d0eaf629af	Merge branch 'master' into dho-apply	2019-10-18 19:45:10 +09:00
smoogipoo	89f50b26f7	Fix hitobject combo colour potentially not getting adjusted	2019-10-18 17:32:11 +09:00
smoogipoo	5d3d25d3b6	Make method private for now	2019-10-18 13:24:28 +09:00
smoogipoo	9a896d52bf	Fix nested hitobjects not updating	2019-10-18 13:18:41 +09:00
smoogipoo	f429a8f7c2	Add back/obsolete old AddNested() method	2019-10-17 14:02:08 +09:00
smoogipoo	d8f3678c3c	Rename parameter	2019-10-17 12:53:54 +09:00
smoogipoo	8d7453c251	Rework construction of nested hitobjects	2019-10-16 22:10:50 +09:00
Dean Herbert	ad6b8d3e04	Add result offset bounding to result itself, rather than just transforms	2019-10-09 19:08:55 +09:00
Dean Herbert	51bf600ea7	Use empty hitwindows instead of null	2019-10-09 19:08:31 +09:00
smoogipoo	897b3233af	Add start time tracking to EditorBeatmap	2019-10-03 14:23:48 +09:00
smoogipoo	45f2bcc440	Fix combo bindings not being bound to nested hitobjects	2019-09-26 17:39:19 +09:00
smoogipoo	706e884cc0	Update accent colour on combo index change	2019-09-26 17:13:13 +09:00
smoogipoo	bbf0544a8d	Add bindables for IHasComboInformation properties	2019-09-26 16:55:08 +09:00
Dean Herbert	7d5544460b	Fix mania scrolling speed not including beatmap slider multipli… (#6236) ... Fix mania scrolling speed not including beatmap slider multiplier Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-09-25 22:34:46 +09:00
Bartłomiej Dach	9323df26a1	Decouple bar line hitobjects from generator ... Introduce an IBarLine interface, which together with generic constraints helps decouple BarLineGenerator from the actual hitobject types it creates. Thanks to this, all rulesets that want bar lines can provide an implementation of IBarLine that also derives from the base hitobject class. This allows DrawableBarLines in taiko and mania to be migrated back to DrawableTaikoHitObject and DrawableManiaHitObject base classes respectively. This in turn resolves #6215 without code duplication, since the missing anchoring application is now done in mania's DrawableBarLine through deriving from DrawableManiaHitObject.	2019-09-25 00:36:27 +02:00
smoogipoo	75cceb9e30	Fix LifetimeChanged being invoked before lifetime is set	2019-09-24 16:47:34 +09:00
smoogipoo	762adb783a	Fix duplicate invocation of updateState on load complete	2019-09-19 14:15:06 +09:00
Dean Herbert	5901a915e7	Always update drawable hitobject state on skin change	2019-09-18 20:19:57 +09:00
Dean Herbert	b81b162ee1	Update InitialLifetimeOffset comment	2019-09-12 19:30:27 +09:00
Dean Herbert	9fc60aeefc	Merge branch 'master' into reset-dho-lifetimes	2019-09-12 19:29:14 +09:00
Dean Herbert	f21e47d6d2	Move expire to DrawableHitObject	2019-09-12 19:29:08 +09:00
Dean Herbert	af3bb5a2cd	Centralise and share bar line generation code between rulesets	2019-09-10 13:30:54 +09:00
Dean Herbert	7f2d14416a	Reset DrawableHitObject lifetimes on state change	2019-09-07 14:44:44 +09:00
Dean Herbert	a50284a5eb	Merge pull request #6019 from peppy/hit-window-refactor ... Refactor HitWindows for legibility	2019-09-06 16:10:04 +09:00
Dean Herbert	c379480e7b	Merge branch 'master' into remove-judgement-occurred	2019-09-06 15:32:34 +09:00
Dean Herbert	f925e781a9	Refactor HitWindows for legibility	2019-09-06 15:24:14 +09:00
smoogipoo	07f662071d	Remove judgementOccurred	2019-09-04 18:14:55 +09:00
Dean Herbert	bebc3309ce	Refactor skin configuration to be infinitely extensible	2019-09-03 17:57:34 +09:00
Dean Herbert	1e7528c2b3	Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements	2019-09-02 19:13:00 +09:00
smoogipoo	f20e07136a	Add attribute to catch potential future nullrefs	2019-09-02 17:48:41 +09:00
smoogipoo	f6102b4d92	Adjust xmldoc	2019-09-02 17:15:36 +09:00
smoogipoo	0c73c5acf3	Expose full hitobject rather than hit windows	2019-09-02 17:14:40 +09:00
smoogipoo	f2bdf94a1d	Add HitWindows to JudgementResult to indicate timing errors	2019-09-02 16:28:14 +09:00
smoogipoo	8f8d35bd15	Delay initial hitobject state computation	2019-09-02 15:06:34 +09:00
Dean Herbert	741bd0a5cf	Fix incorrect colour sizes and simplify alignment specification	2019-08-30 18:35:17 +09:00
Dean Herbert	9a98f39f06	Share logic with other rulesets (and make default)	2019-08-28 18:12:47 +09:00
smoogipoo	9e926d44c0	Obsolete legacy UpdateState() method	2019-08-27 16:09:47 +09:00
Dean Herbert	dbb3b583cf	Log error for invalid beatmap/storyboard events instead of thro… (#5611) ... Log error for invalid beatmap/storyboard events instead of throwing Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-08-09 12:56:47 +09:00
Dean Herbert	7e9c100c9b	Apply new resharper refactors	2019-08-09 12:29:33 +09:00
smoogipoo	de4ad1f625	Fix bad log message	2019-08-08 14:44:49 +09:00
smoogipoo	ac2060f1cf	Throw exceptions and let LegacyDecoder handle them	2019-08-08 14:44:04 +09:00
smoogipoo	0ff1c6184b	Add generation comment	2019-08-01 17:36:20 +09:00
smoogipoo	a2468e599b	Fix ticks in repeat spans being returned in reverse order	2019-08-01 17:31:37 +09:00
Dean Herbert	894d573fbc	Cache DrawableHitObject for skinnables to access (#5463) ... Cache DrawableHitObject for skinnables to access	2019-07-29 18:49:37 +09:00
iiSaLMaN	ba4045a761	Fix transforming mods not working properly ... Hidden, Grow, Deflate, etc..	2019-07-27 00:22:40 +03:00
Dean Herbert	eb6bda3f08	Cache DrawableHitObject for skinnables to access	2019-07-25 16:03:07 +09:00
smoogipoo	4e7e2d1d52	Adjust comments	2019-07-23 21:16:09 +09:00
smoogipoo	74b09c72fa	Refactor state updates to convert State into an IBindable	2019-07-23 21:16:09 +09:00
Dean Herbert	d4d286c988	Add full documentation	2019-07-22 16:08:38 +09:00
Dean Herbert	c3b81bef4a	Flip default to the preferred method going forward	2019-07-22 15:55:38 +09:00
Dean Herbert	be170b4124	Naming and documentation improvements	2019-07-22 15:50:02 +09:00
Dean Herbert	91f86adb66	Move DrawableHitObject state management to base class	2019-07-22 15:07:12 +09:00
Dean Herbert	8327452fe1	Make AccentColour a bindable	2019-07-22 14:48:59 +09:00
Dean Herbert	3e57fcf5c5	Merge remote-tracking branch 'upstream/master' into cleanup-slider-bodies	2019-07-17 22:11:01 +09:00
Dean Herbert	1a19cf0739	Fix 0-length sliders not getting correct lengths (#5033) ... Fix 0-length sliders not getting correct lengths	2019-07-17 18:01:57 +09:00
smoogipoo	a9286fee07	Recycle slider paths when the parenting slider dies	2019-07-17 16:20:27 +09:00
smoogipoo	ed203cb0ff	Delay intial hitobject updates	2019-07-16 13:45:59 +09:00
smoogipoo	5862eb172a	Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders ... # Conflicts: # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs	2019-07-05 15:48:04 +09:30
Dean Herbert	60ea3d4e1a	Fix skinning support for combobreak	2019-06-30 21:58:30 +09:00
smoogipoo	a6ee83eac2	Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders	2019-06-27 19:57:21 +09:00
Dean Herbert	ba48331fcb	Remove no longer necessary HandleInput overrides	2019-06-27 18:34:59 +09:00
smoogipoo	2e7922c3f9	Fix 0-length sliders not getting correct lengths	2019-06-15 23:53:28 +09:00
Dean Herbert	cf713fbacc	Merge branch 'master' into fix-stacking-shaking	2019-06-14 22:16:35 +09:00
smoogipoo	4818187d8f	Reset result timeoffset to 0 when rewound	2019-06-13 14:55:52 +09:00
smoogipoo	27fdda8b91	Don't update hitobject results when rewinding	2019-06-13 12:21:49 +09:00
Arphox	07e17518e9	Fix all "Maintainability" CodeFactor issues	2019-06-11 10:28:16 +02:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	c97116c91a	Add safety against DrawableHitObject implementations clearing children	2019-03-25 13:34:22 +09:00
smoogipoo	6511234804	Fix catch spinners not being allowed for conversion	2019-03-20 13:53:22 +09:00
Dean Herbert	14af957599	Merge pull request #4468 from smoogipoo/fix-min-tick-distance ... Fix ticks not being generated at the minimum tick distance	2019-03-15 12:12:48 +09:00
smoogipoo	71d79f0a39	Fix ticks not being generated at the minimum tick distance	2019-03-14 15:20:12 +09:00
Dean Herbert	8f00f2290a	Log issues	2019-03-13 14:56:41 +09:00
Dean Herbert	f8b5cf8c8e	Add extra clamping of endTime to startTime	2019-03-13 13:46:41 +09:00
Dan Balasescu	a35d9ccc09	Apply clamping suggestion ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-13 12:35:05 +09:00
Dean Herbert	93b774104a	Fix NaN handling	2019-03-13 11:30:33 +09:00
Dean Herbert	cc09ecbfcf	Increase validation performed on .osu files to avoid hard crashes	2019-03-12 20:31:15 +09:00
Dean Herbert	63fea65c0c	Clarify repeat index	2019-03-11 14:53:21 +09:00
Dean Herbert	489153579a	Add xmldoc and clarify struct variables	2019-03-11 14:36:29 +09:00
Dean Herbert	2029cf93fd	Rename and reuse variables	2019-03-11 14:33:21 +09:00
Dean Herbert	93a999396e	LegacyFinalTick -> LegacyLastTick to match existing variable	2019-03-08 20:13:11 +09:00
Dean Herbert	355705f0a5	Fix legacy tick handling	2019-03-08 19:57:30 +09:00
Dean Herbert	973f29b765	Apply review	2019-03-08 15:14:57 +09:00
smoogipoo	a08086cc8a	Fix volume not being considered for file samples	2019-03-05 18:21:29 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
smoogipoo	f66fefb818	Adjust comment + accessibility	2019-02-27 16:30:10 +09:00
smoogipoo	a07d797d75	Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization	2019-02-27 12:08:43 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
ekrctb	8955d5de04	Update hit object result when lifetime is end	2019-01-29 15:25:27 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
Ivan Pavluk	28b033bd99	Autodetect LowestSuccessfulHitResult	2018-12-12 17:15:59 +07:00
Ivan Pavluk	e49e2fda9e	Rename SuccessfulHitResult->LowestSuccessfulHitResult	2018-12-12 13:24:58 +07:00
Dean Herbert	ffb91b4afc	Update docstring ... Co-Authored-By: pavlukivan <pavlukivan@outlook.com>	2018-12-12 13:11:03 +07:00
Dean Herbert	d86cbf66a9	Update docstring ... Co-Authored-By: pavlukivan <pavlukivan@outlook.com>	2018-12-12 13:10:47 +07:00
Ivan Pavluk	a62b105fb5	Fix formatting	2018-12-10 05:06:18 +00:00
Ivan Pavluk	8457324044	SuccessfulHitWindow->SuccessfulHitResult	2018-12-10 09:04:12 +07:00
Dan Balasescu	77a544e475	formatting fix ... Co-Authored-By: pavlukivan <pavlukivan@outlook.com>	2018-12-09 23:38:29 +07:00
Dan Balasescu	784a114eae	formatting fix ... Co-Authored-By: pavlukivan <pavlukivan@outlook.com>	2018-12-09 23:38:19 +07:00
Ivan Pavluk	cb2444e01c	Remove Meh from TaikoHitWindows	2018-12-06 19:04:54 +07:00
smoogipoo	9fdd48ded2	Add 1ms offset to controlpoint lookup times	2018-12-04 12:08:46 +09:00
smoogipoo	eb88768bd0	Fix incorrect controlpoint being applied to samples	2018-12-03 17:21:27 +09:00
smoogipoo	aea84f737b	Fix taiko hitobjects potentially disappearing before being judged	2018-11-29 12:12:29 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	f3ba429701	Make sure control points is internally initialised	2018-11-12 17:14:06 +09:00
smoogipoo	f4fd6189f8	Implement IEquatable	2018-11-12 16:53:30 +09:00
smoogipoo	0220ed21b0	Ignore distance for json serialisation	2018-11-12 16:38:49 +09:00
smoogipoo	0e92b385f0	Define default json deserialisation constructor	2018-11-12 16:38:33 +09:00
smoogipoo	8ad9b6a02a	Safety for default(SliderPath)	2018-11-12 16:38:14 +09:00
smoogipoo	d594ce3530	Revert "Make SliderPath.ControlPoints read-only" ... This reverts commit 3b88d94793. # Conflicts: # osu.Game/Rulesets/Objects/SliderPath.cs	2018-11-12 16:20:38 +09:00
smoogipoo	77d16aa968	Add xmldocs	2018-11-12 14:16:21 +09:00
smoogipoo	4eef1134a6	Re-order file	2018-11-12 14:08:36 +09:00
smoogipoo	3aba462e52	Make Path.Distance a property again	2018-11-12 14:07:48 +09:00
smoogipoo	3b88d94793	Make SliderPath.ControlPoints read-only	2018-11-12 14:03:54 +09:00
smoogipoo	54ab256c8e	Instantiate a new path rather than setting properties on it ... # Conflicts: # osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs # osu.Game.Rulesets.Catch/Objects/JuiceStream.cs # osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/SliderPath.cs	2018-11-12 13:50:19 +09:00
smoogipoo	cf4dad0fe8	Fix hitobjects not updating IsMaskedAway after being judged	2018-11-07 15:42:40 +09:00
smoogipoo	ace1dce281	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs	2018-11-05 18:10:22 +09:00
smoogipoo	92d570342c	Fix sample additions not falling back to non-addition bank	2018-11-05 17:35:24 +09:00
smoogipoo	a4caaf56ef	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs	2018-11-05 16:38:28 +09:00
smoogipoo	1fffa48aa0	Sort nested hitobjects post-creation	2018-11-05 12:15:45 +09:00
Dean Herbert	e6ee3dc73e	Use framework helper functions for path approximation	2018-11-02 19:26:29 +09:00
smoogipoo	1aae123ff5	Make approximators share an interface	2018-11-01 19:16:44 +09:00