1691 Commits

Author	SHA1	Message	Date
Dean Herbert	cfdac956c2	Fix issues with colour and skin application	2019-09-18 20:04:49 +09:00
Dean Herbert	9c9cb8e217	Merge remote-tracking branch 'upstream/master' into traceable-mod	2019-09-18 19:36:07 +09:00
Dean Herbert	26eca5b1f4	Fix judgement sizes not matching skins stable	2019-09-18 02:56:03 +09:00
Dean Herbert	ba76f09c99	Add initial implementation of hit lighting ... Requires a supporting skin, like osu!classic for now.	2019-09-18 02:49:54 +09:00
Bartłomiej Dach	a407e267a2	Fix PF/SD legacy mod conversion ... Upon investigating an user report in #6091 that indicated that viewing replays using the Perfect mod would also display the Sudden Death mod icon despite Perfect being the more restrictive of the two, it turned out that the logic of importing legacy scores was missing that corner case. A similar case of Double Time/Nightcore mutual exclusion was handled, but PF/SD was missed. Add analogous handling of PF/SD legacy mods for all four rulesets, and additionally cover a tiny fraction of all cases with unit tests. The most problematic cases (NC+HD and PF+SD) are covered in all four basic rulesets.	2019-09-15 22:55:25 +02:00
Dean Herbert	624e5644a4	Change osu!catch key trigger to occur on frame before positional change	2019-09-13 23:06:35 +09:00
Dan Balasescu	125b3fda6c	Merge branch 'master' into improve-catch-replay-frames	2019-09-13 19:23:15 +09:00
smoogipoo	5c2c055614	Set lifetime on initial state update	2019-09-13 18:49:21 +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	acdfeef1dc	Improve how osu!catch stores and replays key actions	2019-09-12 18:33:46 +09:00
Dean Herbert	96efc91b51	Fix follow points not displaying on some skins	2019-09-11 14:57:42 +09:00
Dean Herbert	aea1ab7fee	Merge branch 'master' into skinned-cursortrail-2	2019-09-11 14:11:52 +09:00
Dean Herbert	6760e239a1	Fix osu! hitcircle font textures being incorrectly sized	2019-09-11 13:39:21 +09:00
smoogipoo	6c00d3936a	Reduce interval between cursor trail parts	2019-09-11 13:28:46 +09:00
smoogipoo	70d39e9be4	Always apply stable's magic ratio	2019-09-11 13:28:36 +09:00
Dean Herbert	36d3736e1d	Fix hitcircle font prefix not being read for legacy skins	2019-09-10 18:06:24 +09:00
iiSaLMaN	aec04dcf90	Use Clock.ElapsedFrameTime instead	2019-09-09 15:36:20 +03:00
iiSaLMaN	c4aee11fe0	Revert renaming changes	2019-09-09 15:35:18 +03:00
smoogipoo	e3b972187e	Fix incorrect cursor trail size + scale	2019-09-09 19:30:36 +09:00
smoogipoo	a200485fbd	Implement disjoint (old style) cursor trails	2019-09-09 19:23:02 +09:00
smoogipoo	292d50aacf	Don't confine the cursor trail	2019-09-09 19:22:49 +09:00
smoogipoo	3b1b7910bb	Add toggle for cursor trail interpolation	2019-09-09 19:22:27 +09:00
smoogipoo	1d225ba81e	Add FadeDuration to control cursor trail fade	2019-09-09 19:02:10 +09:00
smoogipoo	195f101799	Move complex property below ctor	2019-09-09 19:00:42 +09:00
smoogipoo	55afcc1e04	Add skin component for the legacy cursor trail	2019-09-09 17:53:51 +09:00
smoogipoo	7adfae3784	Reorder CursorTrail members	2019-09-09 12:35:15 +09:00
iiSaLMaN	9defcb0e99	Remove redundant using directive	2019-09-08 21:37:50 +03:00
iiSaLMaN	f5f2713a17	Account angle change negatively on rewind	2019-09-08 16:14:14 +03:00
iiSaLMaN	3d8b27abfa	RotationAbsolute -> BidirectionalRotation	2019-09-08 16:13:36 +03:00
Dean Herbert	6ce36bd39e	Merge branch 'master' into stop-counting-to-score-after-fail	2019-09-06 16:12:53 +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	b3f61abd49	Use float types for cursor sizes (#5958) ... Use float types for cursor sizes	2019-09-06 15:45:44 +09:00
Dean Herbert	6cdc87bd29	Fix allowed results omissions	2019-09-06 15:37:20 +09:00
Dean Herbert	f925e781a9	Refactor HitWindows for legibility	2019-09-06 15:24:14 +09:00
smoogipoo	bda21998c4	Add helper method to make direct casts be used	2019-09-05 16:48:56 +09:00
Dean Herbert	2983918f71	Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor	2019-09-04 13:40:41 +09:00
Dean Herbert	f8c1afa539	Fix two more cases of judgements appearing on hit error display when they shouldn't	2019-09-03 20:17:39 +09:00
Dean Herbert	858828d4ef	Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher	2019-09-03 18:31:19 +09:00
Dean Herbert	bebc3309ce	Refactor skin configuration to be infinitely extensible	2019-09-03 17:57:34 +09:00
Dan Balasescu	3854bc68e0	Merge branch 'master' into fix-ring-glow-lookup	2019-09-03 16:14:07 +09:00
Dean Herbert	d1cdf49dd5	Revert SkinnableSprite lookups to old behaviour	2019-09-03 14:21:54 +09:00
Dean Herbert	05ed9d3802	Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements	2019-09-03 13:07:58 +09:00
Dean Herbert	4f3511e8e9	Fix ring glow lookup being incorrect	2019-09-03 12:32:10 +09:00
Dean Herbert	0261456d5a	Merge branch 'master' into play-to-gameplay	2019-09-03 11:42:15 +09:00
iiSaLMaN	cb55159b28	Use float types for cursor sizes	2019-09-03 01:28:51 +03:00
Dean Herbert	09097f7680	Merge branch 'master' into iskincomponent	2019-09-02 22:38:57 +09:00
Dean Herbert	0ee0184e01	Remove unnecessary usings	2019-09-02 19:13:06 +09:00
Dean Herbert	1e7528c2b3	Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements	2019-09-02 19:13:00 +09:00
smoogipoo	90671e0617	Attempt to not break per-hitobject hitwindows	2019-09-02 18:58:13 +09:00
smoogipoo	8302658186	Fix other potential nullref cases that rider missed	2019-09-02 18:31:33 +09:00
smoogipoo	4c150839c0	Fix potential diffcalc hitwindow nullref	2019-09-02 17:38:58 +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	f3656475de	Return null hitwindows for non-time-based objects	2019-09-02 16:10:30 +09:00
Dean Herbert	f9fcf1562f	Merge remote-tracking branch 'upstream/master' into iskincomponent	2019-09-02 14:21:02 +09:00
Dean Herbert	2bd074883a	Fix OsuLegacySkin fallback logic being incorrect ... Fixes skin fonts not being applied. This is a temporary fix as configuration retrieval from skins will see a complete rewrite over the coming days.	2019-09-02 12:36:08 +09:00
Dean Herbert	ee4869647f	Merge pull request #5910 from peppy/fix-legacy-skin-text ... Fix legacy skin text reading from the wrong source	2019-08-31 21:51:26 +09:00
Dean Herbert	3da5eb6c8b	Add source lookups for safety	2019-08-31 16:56:32 +09:00
Dean Herbert	2988624f1f	Add fallback for safety	2019-08-31 16:52:41 +09:00
Dean Herbert	f89981e1a3	Fix legacy skin text reading from the wrong source ... Regressed with ruleset legacy skin implementation.	2019-08-31 12:23:15 +09:00
Dean Herbert	70e417533f	Update naming	2019-08-30 15:13:29 +09:00
Dean Herbert	a15828ab25	Introduce the concept of SkinComponents ... Removes reliance on string lookups and better defines elements for introduction into database	2019-08-30 14:55:52 +09:00
Dean Herbert	8f9fe99237	Move SliderFollowCircle implementation	2019-08-30 14:40:36 +09:00
Dean Herbert	22e3ad8b9c	Add skinning support to cursor test	2019-08-30 14:09:17 +09:00
Dean Herbert	c389a5c798	Move remaining osu-specific implementations to OsuLegacySkin	2019-08-30 13:42:29 +09:00
Dean Herbert	84e4748268	Remove duplicate getAnimation function and improve namespacing	2019-08-30 12:59:58 +09:00
Dean Herbert	dc1046bf0c	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-30 12:53:05 +09:00
smoogipoo	6641811125	Add EditorWorkingBeatmap for reuse of the playable beatmap	2019-08-29 19:41:12 +09:00
smoogipoo	6ab2b20c70	Add an interface for working beatmaps	2019-08-29 19:38:44 +09:00
Dean Herbert	9a98f39f06	Share logic with other rulesets (and make default)	2019-08-28 18:12:47 +09:00
Dean Herbert	9752dbf950	Fix osu! approach circles fading in too late	2019-08-28 18:10:58 +09:00
Dean Herbert	7ea55a5cdd	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-28 16:36:20 +09:00
Dean Herbert	7aeeb65ae7	Tidy up Player's container loading logic ... Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).	2019-08-27 18:27:21 +09:00
Dean Herbert	db987c6077	Move SliderBall colour logic to OsuLegacySkinProvider	2019-08-26 14:45:29 +09:00
Dean Herbert	7b82121b85	Add comment about lazy usage	2019-08-26 13:03:00 +09:00
Dean Herbert	5e362d10b1	Add ruleset-specific legacy skin providers ... This moves implementation of osu! skinnables to OsuLegacySkin.	2019-08-26 12:21:49 +09:00
Dean Herbert	745bd58f37	Merge remote-tracking branch 'upstream/master' into update-framework-blending	2019-08-21 15:10:08 +09:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
Dean Herbert	62a24bf16d	Fix a couple of rotation-related issues	2019-08-20 13:18:34 +09:00
Dean Herbert	d0766fa1cd	Add slider ball animation support	2019-08-19 19:55:47 +09:00
Dean Herbert	707911acac	Tidy up code formatting / variable naming	2019-08-12 15:05:27 +09:00
Dean Herbert	45b4fc9201	Add xmldoc	2019-08-12 15:00:32 +09:00
Dean Herbert	31fe121fe9	Merge remote-tracking branch 'RedMindZ/master' into autopilot	2019-08-12 14:40:52 +09:00
Dean Herbert	f7f3f4fb4a	Merge branch 'master' into master	2019-08-12 13:37:09 +09:00
Dean Herbert	59a5df8bca	Update framework (with cached changes) (#5666) ... Update framework (with cached changes)	2019-08-09 23:47:40 +09:00
Dean Herbert	6264a6a1c9	Adjust slider snaking and hitcircle fading to match stable	2019-08-09 20:18:02 +09:00
Dean Herbert	90b1fe81f3	Update cached usage in line with framework changes	2019-08-09 19:12:29 +09:00
smoogipoo	d47a8c0826	Remove unused combo result count statistic	2019-08-09 14:04:51 +09:00
Dean Herbert	73cd7b0cc2	Fix incorrect implementation of old stacking algorithm (#5632) ... Fix incorrect implementation of old stacking algorithm	2019-08-07 21:53:33 +09:00
smoogipoo	bc3a340286	Fix incorrect path position being used for old stacking algorithm	2019-08-07 19:35:39 +09:00
smoogipoo	42de5934f6	Fix incorrect hitobject indices	2019-08-07 19:33:35 +09:00
Dean Herbert	38df49995c	Fix cursor scale not matching osu-stable	2019-08-07 18:35:07 +09:00
smoogipoo	f2b940f930	Add tests	2019-08-01 17:31:37 +09:00
smoogipoo	8a64ab0384	Remove generics from IApplicableToBeatmap	2019-08-01 12:39:32 +09:00
Dean Herbert	f9c95e21be	Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle	2019-07-30 23:44:13 +09:00
Dean Herbert	8e9f8bb565	Merge branch 'master' into slider-ball-scaling	2019-07-30 23:19:28 +09:00
Dean Herbert	fb1f77bd04	Move implementation and colour logic to legacy implementation	2019-07-30 23:06:18 +09:00
Dean Herbert	e6bd02d276	Simplify namespace definition	2019-07-30 22:41:20 +09:00
Dean Herbert	307a6c1095	Remove DefaultCirclePiece	2019-07-30 22:38:29 +09:00
Dean Herbert	1fbaa97218	Merge branch 'master' into add-legacy-hit-animations	2019-07-30 22:20:29 +09:00
smoogipoo	1222536f7a	Rename resource string	2019-07-30 19:10:21 +09:00
Dan Balasescu	114c2006c1	Merge branch 'master' into legacy-cursor-middle	2019-07-30 19:06:28 +09:00
Dean Herbert	4ee20bae30	Merge branch 'master' into slider-ball-scaling	2019-07-30 07:54:40 +09:00
smoogipoo	c01461b951	Recalculate path size when path radius changes	2019-07-29 19:12:41 +09:00
Dean Herbert	766cf9295d	Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations	2019-07-29 19:03:36 +09:00
Dan Balasescu	ef229c0f80	Merge branch 'master' into legacy-cursor-middle	2019-07-29 18:52:11 +09:00
Dean Herbert	a4f30daf13	Merge pull request #5462 from peppy/skin-metric-parity ... Bring playfield ratio in line with stable	2019-07-29 18:49:21 +09:00
Dean Herbert	8487ecf98a	Fix slider ticks being scaled incorrectly (#5460) ... Fix slider ticks being scaled incorrectly	2019-07-29 18:48:27 +09:00
Dean Herbert	afd6024ba2	Fix repeat points being scaled incorrectly (#5459) ... Fix repeat points being scaled incorrectly	2019-07-29 18:48:04 +09:00
Dean Herbert	f2e90fdb26	Scale follow points by circle size (#5458) ... Scale follow points by circle size	2019-07-29 18:47:48 +09:00
Dean Herbert	53a91b46e0	Fix approach circles not scaling to circle correctly when a ski… (#5455) ... Fix approach circles not scaling to circle correctly when a skin is applied	2019-07-29 18:47:36 +09:00
Dan Balasescu	396892da1a	Describe how the ratio came to be	2019-07-29 18:43:05 +09:00
Dan Balasescu	b74c11ad22	Merge branch 'master' into explode-circle-earlier	2019-07-29 18:05:47 +09:00
Dan Balasescu	7779302e82	Merge branch 'master' into skin-scaling-modes	2019-07-29 17:47:07 +09:00
Dean Herbert	3e74079d02	Add incompatibility with scale tween mods	2019-07-29 01:15:57 +09:00
Dean Herbert	07f905d21c	Tidy up code and fix explode animations not playing correctly	2019-07-29 01:00:41 +09:00
Dean Herbert	4204ba6014	Merge branch 'master' into spin-in	2019-07-28 22:51:09 +09:00
smoogipoo	d4f85af19c	Force snaking slider paths to retain a fixed size	2019-07-25 18:22:56 +09:00
Dean Herbert	6cc6aff66e	Fix slider ball sizing when legacy skin falls back to default	2019-07-25 16:30:50 +09:00
Dean Herbert	c1b0130857	Add legacy cursormiddle support	2019-07-25 16:23:04 +09:00
Dean Herbert	859233526d	Move circle visual implementation to new class ... Allows for more precise skin control over state animations.	2019-07-25 16:09:20 +09:00
Dean Herbert	3ca41b9c0a	Merge branch 'skin-metric-parity' into add-legacy-hit-animations	2019-07-25 16:07:23 +09:00
Dean Herbert	73b5a39c6e	Merge branch 'explode-circle-earlier' into add-legacy-hit-animations	2019-07-25 16:06:04 +09:00
Dean Herbert	5e8867066c	Correctly handling bindable scale changes	2019-07-25 14:43:44 +09:00
Dean Herbert	46e17646ac	Align slider path size with legacy skins	2019-07-25 14:22:26 +09:00
Dean Herbert	9473f6d3e3	Fix incorrect ratios being applied to playfield / skin elements ... This now matches osu-stable 1:1.	2019-07-25 14:22:22 +09:00
Dean Herbert	5e153a3dd3	Use scale correctly in DrawableSliderTick	2019-07-25 13:50:20 +09:00
Dean Herbert	2cb3619b54	Allow scaling outside of defined area ... Caters to skins which show borders outside of the circle for repeats.	2019-07-25 13:27:41 +09:00
Dean Herbert	5a9d18380c	Use scale correctly in DrawableRepeatPoint	2019-07-25 13:25:31 +09:00
Dean Herbert	28653e871c	Give repeat points a size specification	2019-07-25 13:24:35 +09:00
Dean Herbert	2b184658d1	Adjust follow points by circle size	2019-07-25 13:06:25 +09:00
Dean Herbert	c989185774	Fix incorrect approach circle scaling	2019-07-25 11:27:24 +09:00
Dean Herbert	c16af88299	Start exploding animation earlier (don't wait for flash)	2019-07-25 11:11:26 +09:00
Dean Herbert	efad9b3150	Merge branch 'master' into skin-scaling-modes	2019-07-24 18:37:31 +09:00
Dan Balasescu	9b526ef61e	Merge branch 'master' into move-state-logic	2019-07-23 20:37:57 +09:00
Dean Herbert	91e21688d8	Make AccentColour a bindable (#5420) ... Make AccentColour a bindable Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-07-23 20:37:47 +09:00
smoogipoo	b1a9ce85e7	Fix ticks being given an extra colour	2019-07-23 20:30:47 +09:00
Dean Herbert	f8feac792c	Return TouchDevice in GetAllMods response	2019-07-23 13:14:28 +09:00
Dean Herbert	d5ee4cbc9c	Move TouchDevice mod to new "system" category	2019-07-23 13:14:28 +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	6d889c8a37	Revert unintended change	2019-07-22 15:43:27 +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	74c961bcff	Add more flexible skin element confine modes	2019-07-22 14:42:56 +09:00
Dean Herbert	e50b70d615	Centralise osu! circle radius specification	2019-07-22 14:40:02 +09:00
Dean Herbert	3e57fcf5c5	Merge remote-tracking branch 'upstream/master' into cleanup-slider-bodies	2019-07-17 22:11:01 +09:00
smoogipoo	9f6ff63634	Fix judgement disposals causing huge LOH pressure	2019-07-17 19:25:41 +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