7073 Commits

Author	SHA1	Message	Date
Dean Herbert	e0d28564d0	Move import logic to shared implementation	2018-02-15 14:22:39 +09:00
Dan Balasescu	c5b71d2cb7	Remove unused using	2018-02-14 23:15:34 +09:00
Dan Balasescu	9f7736fab3	Merge branch 'master' into restore-ruleset-tests	2018-02-14 22:48:29 +09:00
smoogipoo	115484741d	Capture -> Select	2018-02-14 17:54:43 +09:00
smoogipoo	a9d14eadac	Add clearSelection method	2018-02-14 17:53:04 +09:00
smoogipoo	344da5965c	Add a CaptureBox that encloses hitobjects from the drag selection	2018-02-14 14:38:37 +09:00
smoogipoo	fcbeb97a54	Merge remote-tracking branch 'origin/master' into editor-hitobject-movement	2018-02-14 14:08:36 +09:00
smoogipoo	bfb21d3d69	Merge remote-tracking branch 'origin/master' into drag-lenience	2018-02-13 21:39:28 +09:00
Dean Herbert	30581d03d2	Merge branch 'master' into PlayerResumeHotfix	2018-02-13 20:34:22 +09:00
Dean Herbert	86acc84988	Apply formatting	2018-02-13 20:23:51 +09:00
Dean Herbert	5ecb77fda7	Merge remote-tracking branch 'upstream/master' into default-approachrate	2018-02-13 20:23:01 +09:00
Dean Herbert	6f29cd35af	Merge branch 'master' into PlayerResumeHotfix	2018-02-13 20:21:45 +09:00
Dean Herbert	f4ddc0717b	Fix incorrect PlaylistItem drag handling	2018-02-13 20:08:59 +09:00
Dean Herbert	e2d11af4ef	Fix incorrect MusicController drag handling	2018-02-13 20:08:59 +09:00
Dean Herbert	58f20c3723	Merge branch 'master' into editor-hitobject-movement	2018-02-13 18:56:16 +09:00
Dean Herbert	179a151653	Merge branch 'master' into beatmap-import-simplification	2018-02-13 16:54:52 +09:00
Dean Herbert	8c42225646	Fix outdated xmldoc	2018-02-13 15:08:51 +09:00
Dean Herbert	50cdb03cd9	Don't dispose read contexts	2018-02-13 15:08:45 +09:00
Dean Herbert	ab34123ba8	Remove unnecessary class variable	2018-02-13 15:05:19 +09:00
Shane Woolcock	d603d032d5	Inlined delete beatmap dialog	2018-02-13 16:26:05 +10:30
Dean Herbert	3561326306	Remove fixed issue	2018-02-13 14:54:46 +09:00
Dean Herbert	e8e093d6f2	Fix incorrect xmldoc	2018-02-13 14:54:01 +09:00
Shane Woolcock	8d313486b3	Add a confirmation dialog to the Delete option in the beatmap context menu	2018-02-13 00:40:34 +10:30
Dean Herbert	a738664167	Add interface for database context factory	2018-02-12 23:10:05 +09:00
Dean Herbert	64cda9fd0f	Remove incorrect assert assumption	2018-02-12 22:16:09 +09:00
Dean Herbert	8b37fde15b	Only write when writes occur ... Also add finaliser logic for safety. Also better threading. Also more cleanup.	2018-02-12 19:57:21 +09:00
smoogipoo	87baa6febd	Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments	2018-02-12 19:08:13 +09:00
smoogipoo	bfedd1cee0	Remove nested container	2018-02-12 19:01:50 +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
smoogipoo	ee168f9a77	Split out drag selection box from post-capture box ... Cleans up a lot of code, removes handles for now.	2018-02-12 18:20:05 +09:00
Dean Herbert	edc3638175	DatabaseWriteUsage	2018-02-12 17:55:11 +09:00
smoogipoo	1adbe3585c	HitObjectSelectionBox -> SelectionDragger	2018-02-12 16:03:59 +09:00
smoogipoo	cfb2b3f1e8	Rework SelctionLayer to support click-selections	2018-02-12 16:02:42 +09:00
Dean Herbert	cc948d688f	Fix unrelated spacing issue	2018-02-12 15:39:13 +09:00
Dean Herbert	e54de0c267	Remove sqlite-net migration ... Anyone that may have benefited from this already has.	2018-02-12 15:25:09 +09:00
TocoToucan	86f200e257	Fix possible nullref	2018-02-09 22:04:39 +03:00
TocoToucan	a86a4f49cf	Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay	2018-02-09 21:20:49 +03:00
Dean Herbert	721bb7e4dd	Add proper handling for OnlineBeatmapSetID conflicts ... Not yet working	2018-02-09 21:31:33 +09:00
Dean Herbert	a1513351c0	Add missing licence header	2018-02-09 20:35:54 +09:00
Dean Herbert	d547caa04e	Further improve xmldoc	2018-02-09 19:44:17 +09:00
Dean Herbert	867b1b5f65	Move public methods up	2018-02-09 19:39:02 +09:00
Dean Herbert	c84cb0b33c	Fix/add some xmldoc	2018-02-09 19:32:28 +09:00
Dean Herbert	db654004b7	Move BeatmapManagerWorkingBeatmap to its own file	2018-02-09 19:32:18 +09:00
Dean Herbert	fb6dc922c6	Reorder file	2018-02-09 19:25:55 +09:00
Dean Herbert	c7de79caf6	Remove storage class variable	2018-02-09 19:24:17 +09:00
Dean Herbert	5e0cb9d4b9	Simplify beatmap store retrieval	2018-02-09 19:12:29 +09:00
Dean Herbert	a166932468	Add deletion test	2018-02-09 17:51:29 +09:00
Dean Herbert	3b7018fcd6	Simplify beatmap import process	2018-02-09 17:22:48 +09:00
Bang Sunghwan	3894622ddc	Remove redundant initializing field by default	2018-02-09 09:55:02 +09:00
Bang Sunghwan	f20e3ff31d	Fix ApproachRate setting only DEFAULT_DIFFICULTY	2018-02-09 09:45:43 +09:00
Bang Sunghwan	cc6114b344	Fix ApproachRate not inheriting OverallDifficulty when it is undefined	2018-02-09 09:31:19 +09:00
TocoToucan	77a8b36529	Schedule Resume method call without delay	2018-02-08 22:30:15 +03:00
smoogipoo	4699b5ad7c	Fix a few code styling issues ... These are present in the netstandard branch (the rules aren't working there - probably using the wrong configuration).	2018-02-08 23:47:03 +09:00
Dean Herbert	e107566575	Update user object to match new standardised api	2018-02-08 18:06:04 +09:00
Dean Herbert	534eb223b3	Merge branch 'master' into unified-hitwindows	2018-02-08 17:46:29 +09:00
smoogipoo	0511728fbe	Remove "keypress" from comment	2018-02-08 17:38:46 +09:00
Dean Herbert	789e25069f	Fix non-visual tests not cleaning up previous executions	2018-02-08 17:07:59 +09:00
Dean Herbert	cafa605b90	Fix visual settings checkboxes playing sounds in bindable binding ... Move sound binding to much later in the process to avoid programmatic checkbox changes triggering interaction sounds	2018-02-08 14:43:47 +09:00
smoogipoo	46284c61ae	Return HitResult.None instead of null	2018-02-08 14:25:59 +09:00
smoogipoo	c537af0289	Fix/improve commends	2018-02-08 14:25:44 +09:00
smoogipoo	a6f1a4689e	Fix incorrect value copy-pasta	2018-02-08 14:16:37 +09:00
smoogipoo	17aa915c77	Rename DifficultyRange parameters	2018-02-08 13:57:45 +09:00
smoogipoo	802aaefe35	Give rulesets a way to disable/enable perfect/ok hit results	2018-02-08 13:54:08 +09:00
smoogipoo	cfdeac6428	Make hit windows settable by derived classes	2018-02-08 13:38:31 +09:00
smoogipoo	beaecbafbd	Merge branch 'master' into unified-hitwindows	2018-02-08 13:22:44 +09:00
smoogipoo	ccc948a0b9	Update framework (testing)	2018-02-08 12:45:51 +09:00
Dean Herbert	a70989cb70	Rely on bindable's formatting rather than setting a default	2018-02-08 11:12:05 +09:00
Dean Herbert	7e83aedb86	Merge branch 'master' into slider-tooltip-precision	2018-02-08 11:00:46 +09:00
Dean Herbert	67bd375bfa	Merge remote-tracking branch 'upstream/master' into raw-input-fixes	2018-02-07 22:05:44 +09:00
smoogipoo	ee93c0bc19	Use an endian-independent method to find precision	2018-02-07 20:03:37 +09:00
Dean Herbert	6b6d4f9527	Merge branch 'master' into country_rank	2018-02-07 18:49:40 +09:00
Dean Herbert	4c3606f8fb	Handle non-present country rank	2018-02-07 18:34:38 +09:00
Dean Herbert	93c4612f4f	Add comment about deserialising helper	2018-02-07 18:18:26 +09:00
Dean Herbert	647cc4bdad	Remove in-between properties	2018-02-07 18:04:32 +09:00
smoogipoo	23d4c20726	Apply suggestions to normalisation function	2018-02-07 17:31:18 +09:00
Dean Herbert	20c00720e5	Fix formatting	2018-02-07 17:18:38 +09:00
smoogipoo	8e280b6b0c	Use 0.1 precision for playback speed	2018-02-07 13:28:10 +09:00
smoogipoo	bd5db6fc8d	Make playback speed sliderbar use the tooltip text as its display	2018-02-07 13:26:41 +09:00
smoogipoo	406ec6e92d	Make OsuSliderBar always use number of digits from precision	2018-02-07 13:26:17 +09:00
tgi74000	bcd568e607	Check for possible null ranks	2018-02-06 23:00:52 +01:00
tgi74000	d86ce816c7	Add support for country rank	2018-02-06 21:40:52 +01:00
Shane Woolcock	e0c52c69cf	Prevent revert-to-default OnHover from hiding visual settings at beatmap load	2018-02-06 22:31:30 +10:30
Dan Balasescu	b46c388b4c	Merge branch 'master' into fix-skip-button	2018-02-06 14:50:37 +09:00
Dean Herbert	9bfec9b233	Tidy up state change logic	2018-02-06 14:30:01 +09:00
smoogipoo	3fe3123cdc	Merge branch 'master' into ismaskedaway-fix	2018-02-06 14:29:52 +09:00
Dean Herbert	dd8955cd90	Fix skip button not receiving screen-wide input	2018-02-06 14:29:03 +09:00
Dean Herbert	dfc344b47a	Update OpenTK version	2018-02-06 13:47:54 +09:00
Dean Herbert	30b9439263	Fix default mouse sensitivity not reverting correctly	2018-02-05 20:00:36 +09:00
Dean Herbert	7e56519d6a	Add setting for absolute input mapping	2018-02-05 16:13:39 +09:00
Dean Herbert	6b35ef7063	Update OpenTK version	2018-02-05 16:13:30 +09:00
Imnooby	c4f3223e34	Stops non-url text from being hyperlinks ... Fixed crash when you attempted to click one	2018-02-03 18:24:49 -06:00
smoogipoo	9225e883c1	Add + use HalfHitWindow	2018-02-02 20:29:50 +09:00
smoogipoo	6976347d64	Protect hit window values	2018-02-02 20:28:59 +09:00
smoogipoo	e45b26c742	Cleanup/minify HitWindows	2018-02-02 19:35:44 +09:00
smoogipoo	d371425c87	BAD -> MEH	2018-02-02 18:56:44 +09:00
smoogipoo	70462ebee3	Make HitWindows settable by derived HitObjects	2018-02-02 18:53:05 +09:00
smoogipoo	acf20c079c	General improvements around usage of HitWindows for mania	2018-02-02 18:47:54 +09:00
smoogipoo	558c53a6ba	Give HitObject some HitWindows	2018-02-02 18:47:10 +09:00
smoogipoo	a0c1662fb7	Move mania's HitWindows to osu.Game	2018-02-02 17:52:55 +09:00
smoogipoo	75858bd3de	Update in-line with framework changes	2018-02-02 15:41:54 +09:00
Dean Herbert	39160d895c	Update design of "revert to default" button ... Also fixes some inconsistencies in padding	2018-02-02 15:18:39 +09:00
Dan Balasescu	2c45fc67a4	Merge branch 'master' into PlayerSettigsOverlay_InputHandle	2018-02-02 11:12:33 +09:00
tgi74000	b0fbae9dfc	Fix PlayerSettingsOverlay not reappearing when Hidden	2018-02-01 16:07:49 +01:00
tgi74000	e08a9350a0	Store and show SSPlus and SPlus statistics	2018-02-01 15:19:49 +01:00
Dean Herbert	5ba84a67f1	Merge branch 'master' into catmull-sliders	2018-02-01 20:58:33 +09:00
Dan Balasescu	c486609174	Merge branch 'master' into fix-replay-time-stop	2018-02-01 20:08:58 +09:00
smoogipoo	13f16077d4	Implement Catmull-Rom curve approximator	2018-02-01 20:04:41 +09:00
Dean Herbert	9d4ec6f8b5	Merge branch 'master' into ismaskedaway-input-fix	2018-02-01 19:29:10 +09:00
Dean Herbert	1d687c470c	Fix clock not incrementing beyond last frame of replay	2018-02-01 18:49:14 +09:00
Dean Herbert	1cc7c23982	Hits -> JudgedHits	2018-02-01 18:08:15 +09:00
Dan Balasescu	c1d5a68e4d	Merge branch 'master' into VisualSettingsOverlay	2018-02-01 16:37:04 +09:00
Dan Balasescu	0589708da5	Merge branch 'master' into inactive-volume-duck	2018-02-01 16:21:33 +09:00
Dan Balasescu	d332a2dddd	Merge branch 'master' into url-parsing-support	2018-02-01 16:13:32 +09:00
smoogipoo	1b99e54005	Fix IsMaskedAway not being up-to-date when fastfowarding replays	2018-02-01 15:21:23 +09:00
Dean Herbert	cd37be9440	Merge branch 'master' into better-slider-objects	2018-02-01 08:39:39 +09:00
Dean Herbert	cdf4d9b033	Remove empty line	2018-01-31 18:33:18 +09:00
Dean Herbert	46a7de1845	Merge branch 'master' into fix-taiko-fastforwarding	2018-01-31 18:30:41 +09:00
Dean Herbert	888d2362fd	Merge branch 'master' into fix-taiko-fastforwarding	2018-01-31 18:30:15 +09:00
Dean Herbert	335f0d577c	Add the ability to duck volume when the game is inactive	2018-01-31 18:16:55 +09:00
Dean Herbert	fef69cea04	Revert "Add volume ducking" ... This reverts commit 01325de3a2897a24b2ba0f585d7e976d0fb44b70.	2018-01-31 18:12:25 +09:00
Dean Herbert	47b92f3d1d	Fix mute button not prolonging volume control display	2018-01-31 18:00:44 +09:00
Dean Herbert	93ffa1f8a2	Fix button alignment and animation	2018-01-31 17:36:53 +09:00
Dean Herbert	86f5c9d6f1	Add inactive volume ducking, rather than outright mute	2018-01-31 16:57:26 +09:00
Dean Herbert	97ae44f23c	Remove outwards exposure of mute property	2018-01-31 16:56:26 +09:00
Dean Herbert	2865dd3a10	Replace missed hardcoded int with enum reference	2018-01-31 16:20:01 +09:00
Dean Herbert	5a99651561	Remove unnecessary arrays	2018-01-31 16:10:55 +09:00
Dean Herbert	042a34e1c2	Add migration to ensure database aligns to changed enum	2018-01-31 16:10:48 +09:00
Dean Herbert	b47061f43d	Merge remote-tracking branch 'upstream/master' into mute-toggle	2018-01-31 14:20:15 +09:00
Dean Herbert	a94b4a9ea0	Merge branch 'master' into url-parsing-support	2018-01-30 18:55:50 +09:00
Dean Herbert	df65443f07	Merge branch 'master' ... Conflicts: osu-framework osu.Game/Screens/Play/Player.cs	2018-01-30 18:31:03 +09:00
Dean Herbert	28b67e3d77	Merge branch 'master' into url-parsing-support	2018-01-30 17:47:55 +09:00
Dean Herbert	53129e5235	Fix text getting truncated after last link in chat line	2018-01-30 17:47:22 +09:00
Dean Herbert	e5188fd151	Add better channel test cases (testing non-existent channels)	2018-01-30 17:43:19 +09:00
Dean Herbert	d81d884a01	Remove unnecessary paren handling from regex ... Can't find a reason for this to exist	2018-01-30 17:16:01 +09:00
Dean Herbert	662c7c5bdc	Fix osump links	2018-01-30 16:44:43 +09:00
Dean Herbert	dd2731b873	Add support for markdown style links	2018-01-30 16:38:45 +09:00
smoogipoo	c97ea3ed60	Post-process beatmap before applying defaults	2018-01-30 15:49:55 +09:00
smoogipoo	b4cd8ea716	GlobalKeyBindingContainer -> GlobalActionContainer ... Consitent with "FrameworkActionContainer".	2018-01-30 14:54:30 +09:00
smoogipoo	ef3fb8c05a	InputManager -> Container where KeyBindings are involved	2018-01-30 14:49:12 +09:00
Dean Herbert	df221b6786	Remove usage of ValueTuple to allow for dynamic recompilation	2018-01-29 17:45:23 +09:00
Dan Balasescu	2bae22999d	Merge branch 'master' into global-mod-binding	2018-01-29 15:18:11 +09:00
Dean Herbert	6e0cb1adb3	Remove redundant arguments	2018-01-29 15:05:07 +09:00
Dan Balasescu	ea0ef96557	Merge branch 'master' into global-mod-binding	2018-01-29 15:04:20 +09:00
Dean Herbert	0879366a30	Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support	2018-01-29 13:52:21 +09:00
Dean Herbert	2b14438fe4	Merge remote-tracking branch 'upstream/master' into url-parsing-support	2018-01-29 12:55:32 +09:00
Dean Herbert	247833174c	Fix incorrect case on migration file	2018-01-27 23:20:49 +09:00
Dean Herbert	a5b0d51205	Merge remote-tracking branch 'upstream/master' into url-parsing-support ... # Conflicts: # osu.Game/osu.Game.csproj	2018-01-27 14:06:58 +09:00
TocoToucan	ce4122b3c4	Display visual settings overlay on PlayerLoader screen	2018-01-26 23:29:54 +03:00
TocoToucan	d82835107c	Remove autohide and clock related logic from Visual settings overlay	2018-01-26 22:20:24 +03:00
TocoToucan	615c831069	Merge from ppy/master	2018-01-26 21:56:17 +03:00
FreezyLemon	8f0ab2040f	Add Jetbrains.Annotations NuGet package	2018-01-26 12:46:28 +01:00
Dean Herbert	7852015db3	Remember mod selection when re-entering song select ... Removes mod application when exiting back to main menu. Alternative to #1968. Closes #1961.	2018-01-26 19:32:57 +09:00
smoogipoo	5742e61e68	Merge remote-tracking branch 'origin/master' into ruleset-configs	2018-01-26 15:39:09 +09:00
smoogipoo	929a710dfc	Merge remote-tracking branch 'peppy/databased-config' into ruleset-configs	2018-01-26 15:37:57 +09:00
Dan Balasescu	81c759f1e1	Make field readonly	2018-01-26 15:17:56 +09:00
smoogipoo	0a505dde2e	Remove MaskingAffectsInput override	2018-01-26 14:47:16 +09:00
Dean Herbert	7a2420ead2	Fix a couple of regressions	2018-01-26 08:21:09 +09:00
Dean Herbert	03154dbc63	Fix incorrect initial migration ... Also adds variant to settings	2018-01-25 23:41:03 +09:00
Dean Herbert	80b8780f56	Revert "Remove game-wise settings store for the time being" ... This reverts commit 72df2c681b.	2018-01-25 18:08:50 +09:00
smoogipoo	57cd50c45e	Reorder the way input is handled for replays ... Fixes https://github.com/ppy/osu/issues/1625 .	2018-01-25 17:39:50 +09:00
Dean Herbert	fd7d7c3953	Merge branch 'master' into MakeMusicControllerDraggableAgain	2018-01-25 09:01:54 +09:00
Dean Herbert	b06f60ac3f	Merge branch 'master' into fix-settings	2018-01-25 07:17:21 +09:00
Dean Herbert	284ff226b1	Merge branch 'master' into local-name-fix	2018-01-25 06:50:28 +09:00
TocoToucan	51e188401f	Make MusicController draggable again	2018-01-25 00:38:22 +03:00
Dean Herbert	df43b7d84e	Merge branch 'master' into fix-settings	2018-01-25 01:21:41 +09:00
Dean Herbert	1e80908022	Merge branch 'master' into fix-settings	2018-01-25 01:19:44 +09:00
smoogipoo	b77f08941c	Make mania play the next note's sounds if no note is hit ... Fixes #1911. This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.	2018-01-24 20:05:37 +09:00
Dean Herbert	53c6526b22	Remove unused code file	2018-01-24 18:04:54 +09:00
Dean Herbert	72df2c681b	Remove game-wise settings store for the time being	2018-01-24 18:01:39 +09:00
Dean Herbert	29e98a58f2	Combine Setting and DatabasedSetting	2018-01-24 17:59:49 +09:00
smoogipoo	8d11596b2f	Minor cleanups	2018-01-24 17:48:42 +09:00
Dean Herbert	aa913f6de5	Merge branch 'master' into ruleset-configs	2018-01-24 17:45:47 +09:00
Dean Herbert	5a00ae36d1	Add database-based configuration for rulesets	2018-01-24 17:45:28 +09:00
smoogipoo	7f299b2533	Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization	2018-01-24 17:44:28 +09:00
Aergwyn	205d3ed896	fix settings not getting injected	2018-01-23 19:42:21 +01:00
Michael Manis	6dfd0b5cc2	Unnecessary because of prior commit.	2018-01-23 10:55:22 -05:00
Michael Manis	d12e18d59b	merged with master	2018-01-23 10:50:57 -05:00
james58899	fa800f0977	fix storyboard path	2018-01-23 18:18:54 +08:00
Dean Herbert	b197cd56af	Allow DI'd OnScreenDisplay to be null	2018-01-23 16:42:31 +09:00
Dean Herbert	c01f67b0d8	Merge remote-tracking branch 'upstream/master' into ruleset-configs	2018-01-23 16:23:25 +09:00
Dean Herbert	384dc162b3	Merge branch 'master' into fix-repeat-confusion	2018-01-23 16:06:07 +09:00
Dean Herbert	52805cd82b	Merge branch 'master' into fix-repeat-confusion	2018-01-23 15:22:37 +09:00
Dan Balasescu	fcea12f83d	Merge branch 'master' into allow-quick-retry-key	2018-01-23 14:59:15 +09:00
Dean Herbert	b793c2ec93	Merge branch 'master' into bdl-cache-changes	2018-01-23 14:10:35 +09:00
smoogipoo	d37844c068	Clean up off-by-one offsets from repeat-related properties	2018-01-23 13:37:25 +09:00
Dean Herbert	fa1f4304f6	Remove usings	2018-01-23 13:24:04 +09:00
Dean Herbert	f823650b10	Allow user choice of the quick retry hotkey	2018-01-23 13:05:07 +09:00
Dean Herbert	b799dac5ac	Merge branch 'master' into mania_stage_fix	2018-01-23 10:55:33 +09:00
Felix Ang	d294fcfb0b	Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?)	2018-01-22 18:42:03 +01:00
Felix Ang	423559ec6c	Update license year.	2018-01-22 18:22:38 +01:00
Dean Herbert	76eac9057d	Merge branch 'master' into mania_stage_fix	2018-01-22 19:06:00 +09:00
Dean Herbert	95f941163b	Merge branch 'master' into direct-show-deleted-sets	2018-01-22 17:08:10 +09:00
Dan Balasescu	73799832ef	Merge branch 'master' into direct-show-deleted-sets	2018-01-22 16:54:32 +09:00
Dean Herbert	a931d6e381	Merge branch 'master' into fix-user-download-cancel	2018-01-22 16:27:26 +09:00
Aergwyn	82c8822888	we need to go back ... reverted change and instead check `DeletePending` when retrieving existing online IDs	2018-01-22 08:04:14 +01:00
smoogipoo	c1331cef1b	Disallow DualStages for non-converted beatmaps	2018-01-22 15:52:54 +09:00
Dean Herbert	56c001fd29	Merge branch 'master' into fix-downloads-during-import	2018-01-22 15:43:39 +09:00
Michael Manis	64d7868c03	Update APi.Username in APIAccess intead of ignoring it.	2018-01-22 01:19:22 -05:00
Michael Manis	794ae5380a	Intverted conditionals.	2018-01-22 01:06:27 -05:00
Michael Manis	87ec36060d	Save the obtained username when online.	2018-01-22 00:50:31 -05:00
Michael Manis	c4252ee022	Use obtained value for displayed name.	2018-01-22 00:50:31 -05:00
Dan Balasescu	152475858b	Merge branch 'master' into fix-downloads-during-import	2018-01-22 14:25:24 +09:00
Dan Balasescu	20be4bbbcd	Merge branch 'master' into better-direct-progress-bar	2018-01-22 14:25:23 +09:00
Michael Manis	35e7399bef	Merge branch 'master' of https://github.com/ppy/osu into restart-crashfix	2018-01-21 23:56:16 -05:00
Dean Herbert	3d4e2d400c	Remove unused using	2018-01-22 13:52:10 +09:00
Dean Herbert	53e40a77dc	Don't show error messages when a download is user-cancelled ... Resolves #1941.	2018-01-22 13:25:49 +09:00
Dean Herbert	88beee2d1f	Keep downloads active until their associated import operation finishes ... This avoids race conditions where a second download can potentially be started while the first is still active.	2018-01-22 13:20:04 +09:00
smoogipoo	9ac035f3d5	Merge branch 'bdl-cache-changes' into ruleset-configs	2018-01-22 13:11:45 +09:00
Dean Herbert	060d80efbe	Continue showing progress bar on direct panels when importing ... Previously the progrress bar would fade out once downloads completed, which felt unintuitive.	2018-01-22 13:05:07 +09:00
smoogipoo	b4e1872322	osu!-side changes in-line with framework BDL cache changes	2018-01-22 12:56:30 +09:00
Michael Manis	530e0afa2c	Use IsCurrentScreen instead of a bool for both checks now.	2018-01-21 22:27:15 -05:00
Michael Manis	964c6da9a4	Use IsCurrentScreen instead of a bool	2018-01-21 22:00:18 -05:00
Michael Manis	806da21760	Removed rreduntant initialization.	2018-01-21 20:24:19 -05:00
Michael Manis	ad2df8d8df	Fixed tilde-key crash at end of beatmap.	2018-01-21 20:09:44 -05:00
TocoToucan	e88f514cf4	Resolve merge conflicts	2018-01-21 18:32:21 +03:00
TocoToucan	4875443e12	Resolve merge conflicts	2018-01-21 18:11:43 +03:00
aQaTL	c4feb67bce	Using field properties to set mute / unmute instead of separate methods	2018-01-20 11:45:04 +01:00
Aergwyn	596044e19d	show beatmapsets with pending deletion in osu!direct	2018-01-19 17:25:32 +01:00
為什麼	feb79ff9e7	Merge branch 'master' into mania_stage_fix	2018-01-19 20:08:24 +08:00
Dean Herbert	652f273961	Ensure previews stop playing when they are removed from the draw hierarchy	2018-01-19 15:46:42 +09:00
aQaTL	4a85266fca	Using BindableBool to mute the volume when it's value changes	2018-01-18 17:23:02 +01:00
Dan Balasescu	250e936099	Merge branch 'master' into preview-fixes	2018-01-19 00:03:47 +09:00
Aergwyn	56619ae926	use ternary expression	2018-01-18 15:53:53 +01:00
smoogipoo	a94ea7025e	Register/Unregister -> BeginTracking/StopTracking and add exceptions	2018-01-18 18:45:48 +09:00
smoogipoo	dee298c395	No more statics + better unregistration	2018-01-18 17:40:05 +09:00
Dean Herbert	7ceed8b5eb	Stop any playing preview when closing the direct overlay ... Resolves #1925	2018-01-18 17:28:56 +09:00
smoogipoo	7910b47868	Move ConfigManager registration/dependency injection to RulesetContainer	2018-01-18 17:00:23 +09:00
smoogipoo	c2c478750d	Remove generics from OSD registration methods	2018-01-18 16:57:32 +09:00
smoogipoo	09dfea7e29	Use tracked settings from ConfigManager changes	2018-01-18 15:26:03 +09:00
aQaTL	9c09b33e4e	Removed no longer used "lastVolume" field	2018-01-17 23:17:59 +01:00
aQaTL	18ff57fdf9	Inline changing mute icon properties with object creation	2018-01-17 21:09:46 +01:00
aQaTL	8471a579e0	Removed no longer neccessary "exiting" flag	2018-01-17 20:56:44 +01:00
aQaTL	a8fb732256	Added muted/unmuted icon	2018-01-17 20:43:08 +01:00
Aergwyn	65bac6d31a	return preview instead of nothing if it exists already ... allows listening to it again after reaching the end	2018-01-17 20:36:47 +01:00
Aergwyn	f86cb30e47	prevent negative width on progress bar	2018-01-17 20:35:28 +01:00
ANDY840119-PC\andy840119	6c67f96fdb	fix ci error	2018-01-18 02:01:01 +09:00
aQaTL	1440edbf8b	Use AudioManager adjustments to mute volume	2018-01-17 17:15:13 +01:00
Dean Herbert	864d106635	Merge branch 'master' into fix-replays	2018-01-18 00:49:02 +09:00
smoogipoo	a05032779f	Remove unneeded event binding	2018-01-18 00:04:33 +09:00
aQaTL	ac41cb59ea	Typo fix, removed unnecessary braces	2018-01-17 14:36:33 +01:00
ANDY840119-PC\andy840119	3b291abf60	Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game/Rulesets/UI/Playfield.cs	2018-01-17 22:27:32 +09:00
smoogipoo	c79603290d	Move TriggerChange to LoadComplete()	2018-01-17 21:52:57 +09:00
Dean Herbert	e7524445ee	Use Restart()	2018-01-17 21:33:19 +09:00
Dean Herbert	54ed608ddb	Mute global track volume when a beatmap preview is playing	2018-01-17 21:26:12 +09:00
smoogipoo	d96234bf40	Enforce that there's only one configmanager per ruleset	2018-01-17 21:08:23 +09:00
smoogipoo	92da02db87	Add extension to filename	2018-01-17 21:07:37 +09:00
Dean Herbert	73d69e2fd9	Add more xmldoc	2018-01-17 20:32:26 +09:00
Dean Herbert	38c5434b82	Remove placeholder methods in OsuGame ... Let's add these when they can actually be implemented.	2018-01-17 20:32:20 +09:00