1069 Commits

Author	SHA1	Message	Date
Dean Herbert	8f3f886805	Merge branch 'master' into PlayerBase	2018-03-08 16:12:12 +09:00
Dean Herbert	f78538fea8	Merge branch 'master' into user-profile-recent	2018-03-07 19:41:52 +09:00
TocoToucan	697ad63d72	Resolve merge conflicts	2018-03-05 22:24:25 +03:00
jorolf	9a29c53c5e	Merge branch 'master' of git://github.com/ppy/osu into volume-control	2018-03-03 19:09:08 +01:00
jorolf	3a420ba826	add the volume overlay	2018-03-03 19:08:35 +01:00
Dean Herbert	66493d200b	Merge branch 'master' into user-profile-recent	2018-03-04 02:45:12 +09:00
Dean Herbert	0e928429d4	Merge branch 'master' into ruleset-replayframes	2018-03-04 01:57:43 +09:00
jorolf	bd75422d88	Merge branch 'master' of git://github.com/ppy/osu into volume-control	2018-03-03 14:10:50 +01:00
smoogipoo	a2c239d5e3	Rename to IBeatmapConverter, move to separate file	2018-03-02 20:19:47 +09:00
Dan Balasescu	4aff659272	Merge branch 'master' into beatmap-conversion-testcases	2018-03-02 16:04:32 +09:00
smoogipoo	1f834825dc	Add testcase to osu.Game in-case nunit tries to discover tests in it	2018-03-02 15:43:55 +09:00
smoogipoo	797d03a65f	Implement basic structure for beatmap conversion testing	2018-03-02 13:13:00 +09:00
Dean Herbert	c54c1699bf	Merge branch 'master' into ruleset-replayframes	2018-03-01 22:26:16 +09:00
smoogipoo	ab4d7fa46e	Remove IScoreParser interface ... It's too early for this.	2018-03-01 02:28:14 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28:14 +09:00
jorolf	46dfb761c5	basic volume meter and testcase	2018-02-28 16:14:52 +01:00
Dean Herbert	bdd88303b3	Merge branch 'master' into editor-hitobject-overlays	2018-02-26 17:53:50 +09:00
naoey	a77d1eedae	Fix achievements parsing and add badges to recent activity.	2018-02-26 13:08:12 +05:30
naoey	7e4bd36391	Create drawable and add response to profile. ... - Add missing JSON fields to response model - Add missing enum value	2018-02-26 01:21:24 +05:30
naoey	e3a1b07172	Create API request and reponse model.	2018-02-26 01:21:16 +05:30
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
V.Kalyuzhny	ef6b207c7e	Fix file case	2018-02-24 14:18:53 +02:00
smoogipoo	278b25bcbd	Fix border being the wrong size	2018-02-23 15:29:56 +09:00
Dean Herbert	c0d983bbdf	Merge branch 'master' into PlayerBase	2018-02-23 13:51:11 +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
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
smoogipoo	7fd7dc1538	Extract playfield scaling into a separate class ... And make it more general.	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	ad2f556133	Add hitobject overlays to selected hitobjects	2018-02-20 18:01:45 +09:00
smoogipoo	4a5cd6520c	Extract playfield scaling into a separate class ... And make it more general.	2018-02-20 13:50:31 +09:00
Dean Herbert	835136aecb	Merge branch 'master' into api-interface	2018-02-20 09:33:53 +09:00
Dean Herbert	f41a40be15	Merge branch 'master' into editor-hitobject-movement	2018-02-19 17:59:50 +09:00
smoogipoo	4898c321f8	Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement	2018-02-19 17:07:03 +09:00
Dean Herbert	75dcf72520	Improve testability of API	2018-02-16 13:57:39 +09:00
Dean Herbert	f22f9b5de0	Merge branch 'master' into PlayerBase	2018-02-16 11:26:57 +09:00
TocoToucan	c57e8785e2	Move all storyboard loading to Player itself	2018-02-15 23:57:53 +03:00
Dean Herbert	1b13be1372	Cleanups and xmldoc additions	2018-02-15 16:24:14 +09:00
Dean Herbert	a0a65abcac	Crentalise all import logic	2018-02-15 14:22:39 +09:00
Dean Herbert	d340509b1d	Move ArchiveReaders to a more global namespace ... Also moves delete and action logic to a shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	6ff63c2f0c	Move deletion to ArchiveModelImportManager	2018-02-15 14:22:39 +09:00
Dean Herbert	e0d28564d0	Move import logic to shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	58f20c3723	Merge branch 'master' into editor-hitobject-movement	2018-02-13 18:56:16 +09:00
Dean Herbert	a738664167	Add interface for database context factory	2018-02-12 23:10:05 +09:00
smoogipoo	87baa6febd	Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments	2018-02-12 19:08:13 +09:00
smoogipoo	c3212d36ef	Remove handles for now (will be re-implemented)	2018-02-12 18:36:16 +09:00
smoogipoo	e10bb2db05	Unify SelectionLayer and HitObjectCapturer, rename SelectionBox	2018-02-12 18:35:01 +09:00
smoogipoo	20c0dee17d	Remove SelectionInfo	2018-02-12 18:22:52 +09:00