11697 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	c0d983bbdf	Merge branch 'master' into PlayerBase	2018-02-23 13:51:11 +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
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
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
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
Dean Herbert	c84ded258f	Reset mouse confine mode on input setting reset hotkey	2018-02-22 10:08:56 +09:00
tgi74000	426343f136	Fix legacy Taiko replays having reversed inputs	2018-02-21 15:05:51 +01: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