581 Commits

Author	SHA1	Message	Date
smoogipoo	08bb25347c	Make DrawableSlider contain the slider body	2018-02-23 20:27:05 +09:00
Dean Herbert	84b707f4f8	Add basic hitcircle skinning	2018-02-23 13:38:12 +09:00
Dan Balasescu	6cc54a464c	Merge branch 'master' into editor-hitobject-overlays	2018-02-22 14:25:27 +09:00
smoogipoo	844e87aafe	Use the true head position rather than capturing current position	2018-02-22 14:25:10 +09:00
Dean Herbert	a3336f2577	Merge branch 'master' into fix-editor-osu-scale	2018-02-22 14:14:41 +09:00
smoogipoo	604b0fa20a	Fix post-merge issues	2018-02-22 14:11:06 +09:00
smoogipoo	ded2644df8	Merge branch 'master' into editor-hitobject-overlays	2018-02-22 14:08:36 +09:00
Dean Herbert	b74cfffc6f	Merge branch 'master' into editor-hitobject-movement	2018-02-22 13:19:39 +09:00
Dean Herbert	3b4e4bd110	Merge remote-tracking branch 'upstream/master' into general-slider-improvements	2018-02-22 12:28:33 +09:00
smoogipoo	5faec5c2f1	Add a separate property to control playfield area	2018-02-21 20:54:33 +09:00
smoogipoo	08e52e8c15	Remove unnecessary schedules	2018-02-21 18:02:52 +09:00
smoogipoo	9cd9c83f2c	Allow changing accentcolour/bordercolour post-load	2018-02-21 18:00:46 +09:00
smoogipoo	0d60a65c94	Fix OsuAutoGenerator not considering stacking	2018-02-21 17:53:16 +09:00
smoogipoo	f903e6d241	Fix stacking not working with sliders ... Fixes #2093.	2018-02-21 17:46:45 +09:00
smoogipoo	f877b642da	Clean up and document better what "progress" means	2018-02-21 17:10:18 +09:00
Dean Herbert	50d0278cbd	Merge branch 'master' into general-slider-improvements	2018-02-21 11:28:45 +09:00
smoogipoo	9a9f53ddfd	Remove 0.75 scale from osu! playfield in the editor	2018-02-21 11:10:43 +09:00
smoogipoo	4934ef7429	Add playfield aspect ratio + scaling modifications to composer layers	2018-02-21 11:07:42 +09:00
smoogipoo	7fe0989427	Merge branch 'general-slider-improvements' into editor-hitobject-overlays	2018-02-20 23:51:47 +09:00
smoogipoo	ee055b8e5c	Allow customizing the snake-ability of sliders	2018-02-20 20:53:06 +09:00
smoogipoo	8270e4d758	Add BorderColour to SliderBody	2018-02-20 20:51:28 +09:00
smoogipoo	ad2f556133	Add hitobject overlays to selected hitobjects	2018-02-20 18:01:45 +09:00
Dan Balasescu	3d7f998c9b	Merge branch 'master' into osu-rulesetcontainer-aspect	2018-02-20 14:07:04 +09:00
smoogipoo	8f25a5da66	Add playfield aspect ratio + scaling modifications to composer layers	2018-02-20 14:01:33 +09:00
smoogipoo	4898c321f8	Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement	2018-02-19 17:07:03 +09:00
smoogipoo	cd2c9a9de6	Adjust xmldoc and rename to GetAspectAdjustedSize	2018-02-19 17:04:18 +09:00
smoogipoo	ef11ce3dd1	Remove Size override from OsuPlayfield	2018-02-19 17:02:27 +09:00
Dean Herbert	58af66bfc0	Merge branch 'master' into editor-hitobject-movement	2018-02-16 13:59:11 +09:00
Dan Balasescu	9f7736fab3	Merge branch 'master' into restore-ruleset-tests	2018-02-14 22:48:29 +09:00
Dean Herbert	58f20c3723	Merge branch 'master' into editor-hitobject-movement	2018-02-13 18:56:16 +09:00
smoogipoo	87baa6febd	Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments	2018-02-12 19:08:13 +09:00
smoogipoo	cfb2b3f1e8	Rework SelctionLayer to support click-selections	2018-02-12 16:02:42 +09:00
Aergwyn	c3ce015869	fade slider ticks with hidden mod	2018-02-11 11:03:01 +01:00
Dean Herbert	534eb223b3	Merge branch 'master' into unified-hitwindows	2018-02-08 17:46:29 +09:00
smoogipoo	c213e58eff	Make slider tails not play hitsounds	2018-02-08 14:40:35 +09:00
smoogipoo	46284c61ae	Return HitResult.None instead of null	2018-02-08 14:25:59 +09:00
smoogipoo	beaecbafbd	Merge branch 'master' into unified-hitwindows	2018-02-08 13:22:44 +09:00
smoogipoo	ccc948a0b9	Update framework (testing)	2018-02-08 12:45:51 +09:00
Dean Herbert	67bd375bfa	Merge remote-tracking branch 'upstream/master' into raw-input-fixes	2018-02-07 22:05:44 +09:00
Dean Herbert	62547dba51	Remove redundant test method	2018-02-06 18:15:21 +09:00
Dean Herbert	3d0ef8b3bd	Move property back to local variable ... Never used elsewhere	2018-02-06 18:14:08 +09:00
Dean Herbert	27fd42fb17	Adjust appear animations of repeats and ticks	2018-02-06 18:10:15 +09:00
Dean Herbert	e417aaa23f	Adjust scale out effect	2018-02-06 17:46:56 +09:00
Dean Herbert	60fb78e49d	Simplify iteration code	2018-02-06 17:46:45 +09:00
Dean Herbert	dfc344b47a	Update OpenTK version	2018-02-06 13:47:54 +09:00
Dean Herbert	6b35ef7063	Update OpenTK version	2018-02-05 16:13:30 +09:00
ColdVolcano	bf26fc94d8	Merge branch 'master' into repeat-points	2018-02-03 23:56:40 -06:00
smoogipoo	b15f184261	Make osu! use HitWindows	2018-02-02 20:33:59 +09:00
smoogipoo	13f16077d4	Implement Catmull-Rom curve approximator	2018-02-01 20:04:41 +09:00
Dan Balasescu	cf665b717f	Merge branch 'master' into starrating-fix	2018-02-01 18:44:04 +09:00
Dan Balasescu	39e626f29e	Merge branch 'master' into fix-ticks-appearing-late	2018-02-01 18:28:42 +09:00
Dean Herbert	b8f6dcffaf	Merge remote-tracking branch 'upstream/master' into repeat-points	2018-02-01 13:32:53 +09:00
ColdVolcano	b656858ee6	Fix typos	2018-01-31 21:32:10 -06:00
ColdVolcano	06b615c474	Merge branch 'master' into repeat-points	2018-01-31 21:30:28 -06:00
smoogipoo	00001364c3	Better judgement visualisations in testcase	2018-01-30 18:10:14 +09:00
smoogipoo	cd4a0612c0	Properly construct slider ends using HitObject.AddNested	2018-01-30 16:53:19 +09:00
smoogipoo	4b63d25871	Add hit/miss display to TestCaseSlider	2018-01-30 16:45:48 +09:00
smoogipoo	27357e100a	Simplify condition	2018-01-30 16:28:38 +09:00
smoogipoo	702c4efb88	Give Slider a tail hitobject to make slider ends counts towards score	2018-01-30 16:28:14 +09:00
smoogipoo	b293408147	Construct the head of sliders from Slider	2018-01-30 15:50:48 +09:00
Aergwyn	f6501e73e3	remove unwanted using	2018-01-29 12:08:03 +01:00
Aergwyn	373b3871f9	update SliderTick calculation + more ticks in tests ... math is hard >_<	2018-01-29 12:03:44 +01:00
Thomas Tan	33c5fdcedb	AppVeyor fix	2018-01-29 16:30:46 +08:00
Thomas Tan	c36859ea3a	Create Slider.StackedPositionAt method	2018-01-29 16:22:14 +08:00
Thomas Tan	f66ecae3ff	Merge remote-tracking branch 'upstream/master' into starrating-fix	2018-01-29 16:19:11 +08:00
FreezyLemon	8f0ab2040f	Add Jetbrains.Annotations NuGet package	2018-01-26 12:46:28 +01:00
Thomas Tan	b04e2cbb5c	Fix osu star rating calculation ... The main bug was that the beatmap was not being processed prior to having its Skill values calculated, causing stacking to be ignored in difficulty calculation. The fix involves processing the beatmap with OsuBeatmapProcessor. Another minor bug was that sliders were not taking into account the stacked position midway through the slider (PositionAt does not return stacked position.), so I corrected by adding StackOffset.	2018-01-26 03:39:19 +08:00
Aergwyn	214938b98d	fix SliderTicks appearing too late	2018-01-25 10:52:03 +01:00
ColdVolcano	8eef81e24d	Add more cases to TestCase	2018-01-24 16:16:46 -06:00
ColdVolcano	1f51149da8	Add xmldoc	2018-01-24 15:41:51 -06:00
ColdVolcano	cee8bb50c9	Fix reference points being wrongly selected	2018-01-24 15:34:52 -06:00
Aergwyn	52c4d22c41	review changes ... - use doubles instead of floats - simplify logic	2018-01-24 09:44:50 +01:00
Aergwyn	4baadfdd16	fix oversight	2018-01-23 16:44:33 +01:00
ColdVolcano	efae00c149	make repeat points look better	2018-01-23 04:31:37 -06:00
Aergwyn	24b7d91f5b	Merge branch 'master' into fix-repeats-appearing-early	2018-01-23 09:04:45 +01:00
smoogipoo	33c52ba30f	Fix off-by-ones in RepeatPoint code	2018-01-23 13:58:43 +09:00
smoogipoo	d37844c068	Clean up off-by-one offsets from repeat-related properties	2018-01-23 13:37:25 +09:00
Aergwyn	b726f90c37	remove unnecessary variable	2018-01-22 12:44:55 +01:00
Aergwyn	66176f2882	fix RepeatPoint animations ... - FadeIn and -Out for RepeatPoints are now calculated instead of fixed values - TimePreempt is now cut down if too long for RepeatPoints following the first one to only show up to two RepeatPoints at any given time	2018-01-22 12:36:38 +01:00
Shawdooow	29466438a3	fix values	2018-01-19 20:58:43 -05:00
Shawdooow	c29eea870d	correct values	2018-01-19 20:56:41 -05:00
Shawdooow	e109d5fe20	fix slider heads	2018-01-19 11:13:49 -05:00
Shawdooow	4d1142a0ce	overall difficulty	2018-01-19 11:11:28 -05:00
smoogipoo	6908597b95	Fix inverted ternary ... See #1935 - repeat index 1 is at the end of the slider, not the start.	2018-01-18 23:44:00 +09:00
Dan Balasescu	46ba2cda10	Remove unused using	2018-01-18 21:19:06 +09:00
Dean Herbert	1a83770a06	Fix incorrect math	2018-01-18 21:16:15 +09:00
Dean Herbert	065d2a4887	Add licence header	2018-01-18 21:12:53 +09:00
Dean Herbert	01ff1584c2	Fix repeat points not following slider snaking correctly	2018-01-18 21:06:47 +09:00
Dean Herbert	e2965e1682	Remove unused using	2018-01-18 20:46:57 +09:00
Dean Herbert	063767e381	Prioritise hit normal ... It's always first but not strictly guaranteed anywhere yet.	2018-01-18 20:37:46 +09:00
Dean Herbert	97884e1d05	Remove unnecessary null checks	2018-01-18 19:57:49 +09:00
Dean Herbert	b4f2bea37b	Fix slider samples playing twice when additions are present	2018-01-18 19:50:26 +09:00
Dean Herbert	9b33499fe7	Merge remote-tracking branch 'upstream/master' into RefactorInputQueues	2018-01-16 20:04:34 +09:00
smoogipoo	c309cc9454	Privatise OnJudgements as much as possible	2018-01-16 15:37:32 +09:00
smoogipoo	8c5ef0a330	Remove base OnJudgement from Playfield to properly accomodate nested playfields	2018-01-15 20:48:57 +09:00
Dean Herbert	0796d33e66	Merge branch 'master' into fix-skipbutton-ordering	2018-01-15 15:54:18 +09:00
smoogipoo	5952f1e7f1	Adjust transforms for cursor transitions	2018-01-12 19:34:14 +09:00
smoogipoo	512e4d2c9f	Rewrite the way that cursor overrides are done game-wide	2018-01-12 18:13:17 +09:00
Dean Herbert	e5056e11f4	Remove extra newline	2018-01-12 18:07:40 +09:00
Dean Herbert	d0881e443b	Merge remote-tracking branch 'upstream/master' into approach-rate	2018-01-12 18:05:16 +09:00
Dean Herbert	58626e3b30	Allow rulesets to create their own instantiation info	2018-01-10 17:04:07 +09:00
Dan Balasescu	9c602f8770	Merge branch 'master' into drawable-fruit-improvements	2018-01-09 22:06:16 +09:00
Dean Herbert	b8bb0a52e3	Move mod implementations to individual files	2018-01-09 14:08:18 +09:00
TocoToucan	ae032cbf23	Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties	2018-01-07 23:40:00 +03:00
Aergwyn	54c0197eb0	remove early fadeout of sliderball on hidden ... it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops	2018-01-07 09:08:33 +01:00
Aergwyn	006b63eb42	remove unnecessary change of spinner end sequence ... it wasn't really visible anyways *shrug*	2018-01-07 09:05:36 +01:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
Dean Herbert	0cc8516aa3	Remove empty cases, add initial ball scale adjust.	2018-01-04 20:53:33 +09:00
Dean Herbert	717b263b77	Comment and better stacking of FadeOuts	2018-01-04 20:47:42 +09:00
Dean Herbert	1f62fe19d5	Make animation a bit more subtle	2018-01-04 20:43:42 +09:00
Dean Herbert	ffc7f7ecf4	Add a better slider "hit" state fade out animation	2018-01-04 20:16:10 +09:00
Dean Herbert	bde957940d	Disallow SliderBall from contracting after EndTime	2018-01-04 20:09:58 +09:00
Shawdooow	94f81a1784	fix	2018-01-03 10:04:36 -05:00
Shawdooow	9122eaa28e	Merge branch 'master' into approach-rate	2018-01-03 10:02:55 -05:00
Shawdooow	23f3cb6467	address review	2018-01-03 10:01:28 -05:00
Aergwyn	1ce6219293	remove unnecessary override	2018-01-03 13:55:24 +01:00
Aergwyn	d94c313947	fix slider follow circle instantly disappearing on slider ends	2018-01-03 08:13:58 +01:00
Dean Herbert	31865b4d96	Rename conflicting variable	2018-01-03 15:12:27 +09:00
Aergwyn	9ddbed6729	crop slider length to not go out of bounds on small screens/ratios ... + use correct methods for short and fast sliders, ooops	2018-01-02 17:10:05 +01:00
Aergwyn	737a53d826	clean up RequiredTypes	2018-01-02 17:04:00 +01:00
Shawdooow	e0beefdfd5	make this a float	2018-01-01 10:30:55 -05:00
Shawdooow	1df79c2f1b	Move stackThreshold up where possible	2018-01-01 10:30:09 -05:00
Aergwyn	80be40ed34	ignore new test classes	2018-01-01 12:08:44 +01:00
Aergwyn	481a16b491	extended hitobject tests	2018-01-01 11:55:30 +01:00
Shawdooow	1502fde1b0	fix slider start circles	2017-12-31 12:04:31 -05:00
Shawdooow	064758b96d	fixes	2017-12-31 11:30:58 -05:00
Shawdooow	3ba5dce052	new Approach to approach rate	2017-12-31 11:15:14 -05:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
Aergwyn	138d78309f	add HitCount enum and replace string usage with enum	2017-12-30 18:07:30 +01:00
Dean Herbert	233904ddef	Merge branch 'master' into scaling-repeat-points	2017-12-30 18:09:32 +09:00
Aergwyn	1f71bd3425	scale the correct part of the repeat point	2017-12-30 09:05:40 +01:00
Dean Herbert	0bd1b75d0b	Fix test case	2017-12-30 15:38:10 +09:00
Dean Herbert	7f54778fed	Merge branch 'master' into hitobject-constructor-safety	2017-12-30 15:32:36 +09:00
Dean Herbert	a2840d2519	Fix FadeInDuration not being passed down to sliders' InitialCircle	2017-12-30 15:21:25 +09:00
Dean Herbert	a0966305d4	Remove unnecessary new event	2017-12-30 14:46:44 +09:00
smoogipoo	b99e0a0439	Fix DrawableHitCircle accepting a base OsuHitObject parameter ... Fixes #1778.	2017-12-30 14:15:42 +09:00
Aergwyn	52dd5ddba6	fix repeat points not scaling properly	2017-12-29 20:03:43 +01:00
Aergwyn	0a2e41884e	add more required types for test slider	2017-12-29 20:01:26 +01:00
Aergwyn	5e887240ae	actually use option to override values...	2017-12-29 18:04:40 +01:00
Aergwyn	6c6fa08a06	added some colour to testsliders ... gray just wasn't sticking out well	2017-12-29 17:56:48 +01:00
Aergwyn	07040f9fd1	rename field	2017-12-29 17:52:28 +01:00
Aergwyn	5c3b67bcef	remove unnecessary values	2017-12-29 17:51:59 +01:00
Aergwyn	f547c7986d	created option to override values before UpdateState is called	2017-12-29 17:50:55 +01:00
Aergwyn	a58b5ff5f2	simplify sequence	2017-12-29 17:46:22 +01:00
Aergwyn	ca9f014714	add required types to testclasses	2017-12-29 17:44:38 +01:00
Aergwyn	b200134a18	fix spinner easing with hidden	2017-12-29 17:44:10 +01:00
Dean Herbert	db8228f69d	Don't think we need this expire call	2017-12-29 18:57:38 +09:00
Dean Herbert	a4f941cdf1	Move lifetime adjustment to DrawableHitCircle	2017-12-29 18:51:14 +09:00
Dean Herbert	dd2ae3f701	SImplify everything	2017-12-29 18:48:10 +09:00
Dean Herbert	0ae00cbd17	Rename one more variable	2017-12-29 18:28:16 +09:00