925 Commits

Author	SHA1	Message	Date
Dan Balasescu	a3d947301b	Merge branch 'master' into beatmap-serialization	2017-12-22 07:38:05 +09:00
smoogipoo	e8e5e8270b	Rename decoder	2017-12-21 14:19:37 +09:00
smoogipoo	c99ea32574	Merge branch 'master' into beatmap-serialization	2017-12-21 13:39:39 +09:00
Aergwyn	bfe986230d	Merge branch 'master' into add-confirmation-dialog	2017-12-18 17:29:06 +01:00
Aergwyn	6ac33e3c00	made DeleteAll-button pink	2017-12-18 17:04:35 +01:00
Dean Herbert	a74ac278fe	Merge remote-tracking branch 'upstream/master' into editor-selection-tool	2017-12-18 21:48:01 +09:00
smoogipoo	09c51df2bd	Marker* -> Handle	2017-12-18 19:21:26 +09:00
smoogipoo	3999940538	DragSelector -> HitObjectSelectionBox	2017-12-18 19:17:26 +09:00
smoogipoo	918e7c9a4b	MenuOverlay -> GameplayMenuOverlay	2017-12-18 16:40:50 +09:00
Dan Balasescu	35b6114d01	Merge branch 'master' into editor-selection-tool	2017-12-18 13:57:32 +09:00
Aergwyn	2e196661bb	Merge branch 'master' into add-confirmation-dialog	2017-12-15 18:11:13 +01:00
smoogipoo	66b19b6c97	Expose selected objects from SelectionLayer	2017-12-15 14:48:24 +09:00
Dean Herbert	b9298325a3	Rename weird config setting	2017-12-15 14:36:51 +09:00
Dean Herbert	99b00143eb	More clean-ups and event bindings	2017-12-15 14:36:51 +09:00
Dean Herbert	78dd975a35	Initial carousel infrastructue changes	2017-12-15 14:36:51 +09:00
smoogipoo	2f1063c5c0	Refactor into separate files + add xmldocs + rename some methods	2017-12-11 21:56:58 +09:00
smoogipoo	7189446943	Merge remote-tracking branch 'origin/master' into editor-selection-tool	2017-12-11 16:34:27 +09:00
Dean Herbert	08727266e7	Merge branch 'master' into add-ruleset-shortname	2017-12-11 15:41:11 +09:00
Dean Herbert	5a6ac73fff	Fix broken tools making broken changes	2017-12-11 15:05:19 +09:00
Dean Herbert	7d8fb12332	DrawableScore -> DrawableProfileScore ... Discern between the other class of the same name	2017-12-11 12:51:02 +09:00
Dean Herbert	98ce856de1	Use more sensible names for classes and methods ... Adds xmldoc in places too.	2017-12-11 12:33:34 +09:00
Dean Herbert	9069f1ccba	Merge branch 'master' into most-played-beatmaps-section	2017-12-11 12:12:23 +09:00
Dean Herbert	d02e1ae896	Update RulesetInfo and add migration	2017-12-10 12:15:55 +09:00
Aergwyn	c97646bea6	added confirmation dialog for Delete ALL beatmaps	2017-12-08 14:27:07 +01:00
FreezyLemon	4a723f7382	Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files	2017-12-08 11:05:00 +01:00
smoogipoo	5341e79102	Remove SelectionDragger for now	2017-12-08 17:51:15 +09:00
smoogipoo	faa921ba05	Fix up post-merge issues	2017-12-08 17:41:10 +09:00
smoogipoo	f41af191ed	Merge remote-tracking branch 'origin/master' into editor-selection-tool	2017-12-08 15:13:18 +09:00
Dean Herbert	44ee11e75f	Merge branch 'master' into fix-beatmap-carousel-lag	2017-12-07 15:30:50 +09:00
smoogipoo	245b5f759f	Underscore + lowercase all keys	2017-12-07 14:37:12 +09:00
smoogipoo	d2dc7c8937	Add OsuJsonDecoder	2017-12-06 00:38:12 +09:00
smoogipoo	b584178e85	Make Beatmap ISerializable and add more JsonIgnores	2017-12-06 00:37:37 +09:00
Dean Herbert	7957e55710	Merge branch 'master' into editor-composer	2017-12-03 14:47:07 +09:00
smoogipoo	a80059032c	Remove PlayfieldOverlay	2017-12-02 20:24:10 +09:00
smoogipoo	5a7c4772bd	Remove PlayfieldUnderlay for now	2017-12-02 19:53:20 +09:00
Aergwyn	a49f3479a2	Split retrieving of beatmap and storyboard decoder ... Storyboard works again. Not satisfied with the solution though.	2017-12-01 19:11:52 +01:00
gtensha	de94082b1e	Fix filename casing to compile on Linux	2017-12-01 18:10:39 +01:00
Aergwyn	806c0e3b26	restructured OsuLegacyDecoder into LegacyDecoder ... Beatmap works, Storyboard not...	2017-12-01 17:43:33 +01:00
smoogipoo	cf859a6cf2	Make the dragger attach to objects it surrounds ... Plus a lot more implementation.	2017-12-02 00:26:02 +09:00
smoogipoo	e8cbde3ae1	Add overlay/underlay	2017-11-30 21:56:19 +09:00
smoogipoo	89772f4efd	A few resharper fixes	2017-11-30 19:54:58 +09:00
smoogipoo	456bbe25f3	Implement toolbox into HitObjectComposer	2017-11-30 16:58:14 +09:00
smoogipoo	ead7456978	Add compose radio buttons + testcase	2017-11-30 15:43:19 +09:00
smoogipoo	fd3049fd65	Merge remote-tracking branch 'origin/master' into editor-composer	2017-11-30 13:47:47 +09:00
jorolf	22403cac89	Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section	2017-11-29 23:09:04 +01:00
jorolf	14fdf98abc	rename GetBeatmapSetsResponse	2017-11-29 23:08:46 +01:00
smoogipoo	36be171c29	Fix up/clean up csprojs for C#7 support	2017-11-30 02:06:03 +09:00
smoogipoo	a0c3349935	Add LangVer.props and osu.Game.props for common csproj properties	2017-11-30 00:45:37 +09:00
smoogipoo	8c30fd490c	Add HitObjectComposer class	2017-11-29 16:22:11 +09:00
smoogipoo	a9cc156d7a	Merge remote-tracking branch 'origin/master' into performance-calculator	2017-11-28 21:38:26 +09:00