108 Commits

Author	SHA1	Message	Date
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
Dean Herbert	3c8d30f8e6	Add a dialog offering to import beatmaps from stable	2017-12-26 00:52:11 +09:00
Dean Herbert	38703e6b85	Merge branch 'master' into add-confirmation-dialog	2017-12-21 22:56:31 +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
FreezyLemon	d2b80fdbfc	Moved "undelete all" logic to BeatmapManager and added a progress notification	2017-12-18 10:55:07 +01:00
Dean Herbert	4c45102d61	Merge branch 'master' into undelete-button-add	2017-12-18 16:28:32 +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
Aergwyn	59e8536ff7	moved action to construction arguments	2017-12-14 17:33:56 +01:00
Aergwyn	cdf9ea0d01	removed unnecessary variable ... and fixed the test because of new DI letting it fail	2017-12-09 13:39:11 +01:00
Aergwyn	114604a642	removed unused DI	2017-12-08 14:45:40 +01:00
Aergwyn	c97646bea6	added confirmation dialog for Delete ALL beatmaps	2017-12-08 14:27:07 +01:00
FreezyLemon	d93a1fdaae	Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add	2017-12-08 10:30:42 +01:00
smoogipoo	d52b84df46	Move KeyboardStep assignment to ctor	2017-12-07 20:53:28 +09:00
FreezyLemon	bf386598b6	Added a new "undelete" button that restores every beatmap with "DeletePending" set to true.	2017-11-30 10:58:32 +01:00
Nicolas Brassard	36cfa552f4	Fix SensitivitySlider keyboard control	2017-11-29 23:03:26 -08:00
smoogipoo	267bb75458	Merge remote-tracking branch 'Aergwyn/master' into netstandard	2017-11-29 23:45:29 +09:00
Dean Herbert	7877f42763	Merge remote-tracking branch 'upstream/master' into new-sounds-and-more	2017-11-27 17:59:24 +09:00
Dean Herbert	af499df6dd	Make a base OsuButton class to handle default samples	2017-11-26 17:17:48 +09:00
Dean Herbert	09facdc838	Add a setting to toggle showing converted beatmaps	2017-11-24 18:34:20 +09:00
smoogipoo	d2ab0621f3	Make osu.Game + rulesets compile with netstandard	2017-11-19 13:46:51 +09:00
smoogipoo	f461f03b08	Make osu! compile with framework changes	2017-11-16 14:51:31 +09:00
Dean Herbert	c765785d00	Mark several long-running tasks as long-running	2017-10-25 11:42:55 +09:00
Dean Herbert	00bb82215b	Merge branch 'master' into revert-to-default-glow	2017-10-24 10:48:08 +09:00
Dan Balasescu	9eab2deee7	Merge branch 'master' into config-slider-keyboardstep	2017-10-24 10:10:39 +09:00
Dean Herbert	df20845fbb	Share one context per file store for performance reasons ... There is now a CreateContext method for retrieving a stand-alone context for threaded use. We may want to add safety against this context being disposed (or just return a fresh one if it is).	2017-10-23 16:35:35 +09:00
Shane Woolcock	ea2934d92c	Add KeyboardStep values for configuration options	2017-10-23 16:06:08 +10:30
Shane Woolcock	5785af9f6a	Reenable revert indicator on audio device since the potential crash was addressed in #1101	2017-10-22 14:22:57 +10:30
Shane Woolcock	b4d575fbcd	Fix namespace and unnecessary using	2017-10-21 13:22:21 +10:30
Shane Woolcock	290fac8990	Temporarily disable revert functionality for audio device, since it crashes	2017-10-21 13:17:03 +10:30
Shane Woolcock	98044a17d3	Fix misaligned settings buttons	2017-10-21 13:16:06 +10:30
Dean Herbert	acc299c7b9	Correct and simplify RulesetStore	2017-10-16 17:02:31 +09:00
Damnae	2c245f4c22	Merge branch 'master' into storyboard_integration ... # Conflicts: # osu.Game/Configuration/OsuConfigManager.cs # osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs	2017-09-22 12:45:34 +02:00
Dean Herbert	98c22e8111	Merge branch 'master' into master	2017-09-22 15:19:23 +08:00
gabixdev	8438ea1267	Fix formatting ;_;	2017-09-21 22:11:35 +02:00
Damnae	fcaabf7fdf	Merge branch 'master' into storyboard_integration	2017-09-19 17:36:29 +02:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
gabixdev	e8462ac134	Add option to disable cursor rotation.	2017-09-17 00:47:55 +02:00
Damnae	cb8029af9e	Add a setting to hide storyboards.	2017-09-15 09:16:56 +02:00
Dean Herbert	b7c9819680	Add context menus to chat names and user panels	2017-09-14 15:43:47 +09:00
Dean Herbert	b1145272d1	Update code to support new inspectcode analysis rules	2017-09-14 12:58:32 +09:00
smoogipooo	57678a13d9	Update in-line with framework changes.	2017-09-04 09:32:35 +09:00
Dean Herbert	8e0d18d36f	Add a button to restore all hidden difficulties	2017-09-01 18:26:01 +09:00
Dean Herbert	39b5b04700	Don't use Bindable for AccentColour ... Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.	2017-08-29 18:17:01 +09:00
smoogipooo	fc6c682d88	Update in-line with framework changes.	2017-08-28 14:42:52 +09:00
smoogipooo	66db3389f6	Update in line with framework changes.	2017-08-28 12:49:33 +09:00
Dean Herbert	ee85515d95	Changes in line with framework changes	2017-08-25 19:18:07 +09:00
smoogipooo	b42c9d21fe	Update LoginSettings in line with framework.	2017-08-25 15:57:43 +09:00
Dean Herbert	e4b832e8a6	Fix a possible nullref when login fails	2017-08-18 10:49:41 +09:00