10960 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Balasescu	edcef4e7ca	Merge branch 'master' into fix-slider-expiry	2018-02-26 12:45:56 +09:00
Dan Balasescu	dbb1d2b4aa	Merge pull request #2118 from peppy/fix-null-channels ... Remove null channels from SkinnableSound playable channels	2018-02-26 12:45:35 +09:00
Dean Herbert	ab9aed351f	Remove null channels from SkinnableSound playable channels	2018-02-25 17:14:35 +09:00
Dean Herbert	f1ddfa0581	Fix sliders never getting a correct lifetime set	2018-02-25 16:25:56 +09:00
Dan Balasescu	c701b8eae5	Merge pull request #2105 from peppy/skinning-basics ... Implement skin support for (most) hitsounds and (osu!) hitcircles	2018-02-24 23:18:12 +09:00
Dean Herbert	4a52df2dd4	Apply review	2018-02-24 23:07:02 +09:00
Dean Herbert	768e0a4e2a	Add SkinnableSound class ... Tidy things up, move logic out of SampleInfo.	2018-02-24 22:47:14 +09:00
Dean Herbert	a312fb365a	Merge remote-tracking branch 'ppy/master' into skinning-basics	2018-02-24 22:41:17 +09:00
Dean Herbert	6d4016e18b	Update framework	2018-02-24 22:41:04 +09:00
Dean Herbert	a70fc7c703	Merge pull request #2112 from VPeruS/fix-case ... Fix migration file case	2018-02-24 21:37:22 +09:00
V.Kalyuzhny	ef6b207c7e	Fix file case	2018-02-24 14:18:53 +02:00
smoogipoo	f5fc9cdfba	Fix catch now having incorrect offsets	2018-02-24 02:59:55 +09:00
smoogipoo	50d1183ec2	Division-by-zero safety + reference our own size	2018-02-24 02:53:02 +09:00
smoogipoo	066abfbdbc	Rename PositionAt -> CurvePositionAt to represent its new meaning	2018-02-24 02:43:36 +09:00
smoogipoo	996e605e61	Remove temporary testcase	2018-02-24 02:39:44 +09:00
smoogipoo	1e1df2aaff	Fix up testcases	2018-02-23 21:04:19 +09:00
smoogipoo	8c90abe0dc	Make slider control points relative to start position	2018-02-23 20:59:27 +09:00
smoogipoo	08bb25347c	Make DrawableSlider contain the slider body	2018-02-23 20:27:05 +09:00
smoogipoo	278b25bcbd	Fix border being the wrong size	2018-02-23 15:29:56 +09:00
smoogipoo	d72290ee24	Make ScaledContainer private	2018-02-23 15:06:08 +09:00
smoogipoo	bea9bf9dd4	Merge remote-tracking branch 'origin/master' into taiko_legacy_rep	2018-02-23 14:40:32 +09:00
smoogipoo	3fdb6845da	Revert unneeded change ... This was already correct as per osu-stable.	2018-02-23 14:40:25 +09:00
Dean Herbert	a36986ef5a	Make ComponentName readonly	2018-02-23 14:28:57 +09:00
Dean Herbert	0e20c4e6bb	Fix typo	2018-02-23 14:27:53 +09:00
Dean Herbert	ff75cf6b75	Remove unnecessary braces	2018-02-23 14:27:39 +09:00
Dean Herbert	f81eb2de65	Remove unnecessary local store	2018-02-23 14:24:32 +09:00
Dean Herbert	92d20eea8c	Add missing licence header	2018-02-23 13:38:12 +09:00
Dean Herbert	6ceabfe19e	Add basic hitsound skinning	2018-02-23 13:38:12 +09:00
Dean Herbert	84b707f4f8	Add basic hitcircle skinning	2018-02-23 13:38:12 +09:00
Dean Herbert	3726db53b5	Allow instantiation of skins	2018-02-23 13:38:12 +09:00
Dan Balasescu	ce7d212c3c	Merge pull request #2103 from peppy/skin-database ... Implement skin import, database and storage	2018-02-23 13:35:46 +09:00
Dean Herbert	e9c5834387	Add query method for now	2018-02-23 13:26:01 +09:00
Dean Herbert	72fcbfe12b	Merge remote-tracking branch 'upstream/master' into editor-hitobject-overlays	2018-02-23 12:37:30 +09:00
Dean Herbert	402d71a8d9	Add user skin setting storage	2018-02-22 16:29:05 +09:00
Dean Herbert	659cf629b6	Add skin seleciton dropdown to settings	2018-02-22 15:46:11 +09:00
Dean Herbert	2351b6ab26	Add migration	2018-02-22 15:46:11 +09:00
Dean Herbert	4c14b32783	Add basic skin database model layout and importing	2018-02-22 15:46:11 +09:00
Dan Balasescu	2910fc53dc	Merge pull request #2101 from peppy/update-framework ... Update framework	2018-02-22 15:45:11 +09:00
Dean Herbert	c070c69522	Update framework	2018-02-22 15:01:53 +09:00
Dean Herbert	ac99ca6881	Merge pull request #2100 from Joehuu/sign-in-edits ... Reword instances of "login" to "sign in"	2018-02-22 14:59:42 +09:00
smoogipoo	0cdf6fa7e2	Make HitObjectOverlay into an OverlayContainer	2018-02-22 14:36:58 +09:00
Dean Herbert	871bcb4142	Merge branch 'master' into sign-in-edits	2018-02-22 14:35:29 +09:00
smoogipoo	45c579630d	Make selectionLayer handle input below object overlays	2018-02-22 14:34:37 +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	94b0a7cff8	Merge pull request #2091 from smoogipoo/fix-editor-osu-scale ... Remove osu! playfield scale from the editor	2018-02-22 14:24:30 +09:00
smoogipoo	07252254eb	Fix post-merge issues	2018-02-22 14:22:04 +09:00
Dean Herbert	ee9a45cc45	Merge branch 'master' into sign-in-edits	2018-02-22 14:18:49 +09:00
Dean Herbert	f2b3d9a0e8	Change some missed instances	2018-02-22 14:17:35 +09:00
smoogipoo	99e9eb81f2	Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays	2018-02-22 14:16:01 +09:00