10772 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	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
Dean Herbert	871bcb4142	Merge branch 'master' into sign-in-edits	2018-02-22 14:35:29 +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
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
Dean Herbert	a3336f2577	Merge branch 'master' into fix-editor-osu-scale	2018-02-22 14:14:41 +09:00
Dean Herbert	8111d7b2bd	Merge pull request #2090 from smoogipoo/editor-hitobject-movement ... Fix editor layers not respecting playfield aspect ratios + scales	2018-02-22 14:12:35 +09:00
Joseph Madamba	3d4bed462b	Reword sign in text	2018-02-21 20:54:47 -08:00
Dean Herbert	7c942eb592	Tidy up layer container logic	2018-02-22 13:42:36 +09:00
Dean Herbert	b74cfffc6f	Merge branch 'master' into editor-hitobject-movement	2018-02-22 13:19:39 +09:00
Dean Herbert	cc3546f907	Merge pull request #2094 from smoogipoo/general-slider-improvements ... Expose SliderBody's snaking and border colour	2018-02-22 13:10:42 +09:00
Dean Herbert	3b4e4bd110	Merge remote-tracking branch 'upstream/master' into general-slider-improvements	2018-02-22 12:28:33 +09:00
Dean Herbert	8ffb5e2aa7	Merge pull request #2097 from smoogipoo/fix-slider-stacking ... Fix stacking not working with sliders	2018-02-22 11:42:52 +09:00
smoogipoo	5faec5c2f1	Add a separate property to control playfield area	2018-02-21 20:54:33 +09:00
smoogipoo	6757be2007	Fix incorrect RelativeChildSize in Catch	2018-02-21 20:15:51 +09:00
Dan Balasescu	671f6233c0	Merge branch 'master' into fix-slider-stacking	2018-02-21 18:26:34 +09:00
Dan Balasescu	e097d8dcd3	Merge branch 'master' into general-slider-improvements	2018-02-21 18:04:26 +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
Dan Balasescu	7e8b677e17	Merge pull request #2096 from peppy/update-framework ... Fix some common CI unit test failure causes	2018-02-21 17:59:17 +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	f012cce668	Rewrite some xmldocs to make methods easier to understand	2018-02-21 17:33:22 +09:00
smoogipoo	f877b642da	Clean up and document better what "progress" means	2018-02-21 17:10:18 +09:00
Dean Herbert	31edcfa35c	Attempt to fix beatmap carousel test failures ... As seen here: https://ci.appveyor.com/project/peppy/osu/build/master-7260#L1164 Potentially was continuing operation too early.	2018-02-21 16:14:45 +09:00
Dean Herbert	cb1ed2fb89	Update framework	2018-02-21 16:14:39 +09:00