38 Commits

Author	SHA1	Message	Date
Dean Herbert	23677a309f	Merge branch 'master' into slider_ticks	2017-02-16 11:06:23 +09:00
Damnae	f1535363f4	Rename SliderTicksRenderer to SliderTicksLayer.	2017-02-15 19:06:54 +01:00
Dean Herbert	31a617363a	Improve the feel of spinners.	2017-02-15 23:24:08 +09:00
Dean Herbert	7fbc5990d1	Add combo numbers.	2017-02-15 23:23:55 +09:00
Dean Herbert	bab219c428	Fix SliderBall weirdness (not correctly staying circular). ... Also adjusts tracking to only change during sldier active time.	2017-02-15 21:51:16 +09:00
Dean Herbert	67105e6dfd	Replace all usage of SpriteText with OsuSpriteText.	2017-02-15 21:37:43 +09:00
Dean Herbert	ce859196d5	Avoid glow fading out early on spinners.	2017-02-15 21:05:46 +09:00
Dean Herbert	12e265a3e2	Combine triangle system implementations.	2017-02-15 20:39:10 +09:00
Damnae	e2fae24ad5	Merge branch 'master' into slider_ticks ... Conflicts: osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs osu.Game.Modes.Osu/Objects/Slider.cs	2017-02-15 10:53:42 +01:00
Dean Herbert	10dfe47638	Add spinners and improve TestCaseHitObjects.	2017-02-15 01:23:20 +09:00
Dean Herbert	fc192906ea	Handle proxied approach layer better and add slider's approach circle (previously missing).	2017-02-15 01:23:19 +09:00
Damnae	ace7a1d009	Fix slider ticks expiring before scoring happens.	2017-02-14 16:12:35 +01:00
Damnae	9f890139d4	Cache drawable ticks.	2017-02-14 15:16:18 +01:00
Damnae	3e7208c8a4	Add slider ticks.	2017-02-14 11:26:24 +01:00
Dean Herbert	343e48c195	Merge branch 'master' into followpoints	2017-02-13 22:23:57 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +09:00
Damnae	daa14bfec8	Replace AddConnections by a HitObjects property.	2017-02-12 08:47:07 +01:00
Damnae	de2791e179	Better looking follow points.	2017-02-12 08:22:13 +01:00
Damnae	d7be9539d1	Create connections from HitObjects instead of DrawableHitObjects.	2017-02-12 07:29:36 +01:00
Damnae	4162ef72d4	Remove start/end index.	2017-02-12 06:02:45 +01:00
Damnae	ec64455573	Add xml-doc.	2017-02-10 10:28:21 +01:00
Damnae	6f37c02868	Fix followpoints needing a DelayReset.	2017-02-10 10:07:52 +01:00
Damnae	4e6b6ab794	Abstract follow points into a separate class.	2017-02-10 08:10:24 +01:00
Damnae	77ee161be8	Add follow points.	2017-02-10 06:19:59 +01:00
Damnae	a79fde897b	Add StackedPosition/StackedEndPosition and offset slider curves by StackOffset.	2017-02-09 08:29:21 +01:00
Damnae	38b25a7df3	Add hit object stacking.	2017-02-09 07:28:40 +01:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	9b9ed32245	Remove all @2x references, updates resource and framework.	2017-02-06 22:19:47 +09:00
Thomas Müller	8271b139e9	Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.	2017-02-05 09:40:58 +01:00
Dean Herbert	8ba5c1c15d	Fix not being able to hit two stacked circles by pressing both buttons/keys on the same frame.	2017-01-08 20:52:19 +08:00
Dean Herbert	ec7bbd231f	Make flash animation last slightly longer.	2016-12-15 22:58:30 +09:00
Dean Herbert	0a9e3ce1b0	Don't handle input in triangle particle effect containers.	2016-12-15 22:58:19 +09:00
Dean Herbert	db5c2efa15	Rename tracking variable and change conditional as per feedback.	2016-12-13 18:12:35 +09:00
Dean Herbert	c420c55291	Merge branch 'master' into hit-samples ... # Conflicts: # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs	2016-12-13 17:57:24 +09:00
Thomas Müller	eef697d842	Wire up CircleSize to hitobjects. ... Note, that circle sizes still are wrong compared to stable osu. In order to fix this, the base radius of hitcircles needs to become 64, but it currently is 72.	2016-12-11 10:11:22 +01:00
Thomas Müller	2ced0a48e0	Update framework.	2016-12-10 14:37:00 +01:00
Dean Herbert	8329022a2e	Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples	2016-12-08 21:41:02 +09:00
Dean Herbert	40ea6e0d72	Fix incorrect folder name.	2016-12-08 21:36:34 +09:00