1559 Commits

Author	SHA1	Message	Date
Dean Herbert	392a0a1d74	Merge branch 'master' into update-framework	2019-03-18 11:34:59 +09:00
Dan Balasescu	e0b3149e32	Merge branch 'master' into api-testability	2019-03-18 10:59:06 +09:00
Dean Herbert	c496f6e56b	Fix usages of OnLoadComplete	2019-03-17 13:44:20 +09:00
Dean Herbert	36e5c09710	Merge pull request #4433 from nekodex/prevent-null-lookup ... Don't perform lookup of beatmap stats unless an online id is present	2019-03-15 10:39:39 +09:00
Dean Herbert	8f00f2290a	Log issues	2019-03-13 14:56:41 +09:00
Dean Herbert	241e336c21	Fix break parsing	2019-03-13 14:22:16 +09:00
Jamie Taylor	7a2af5634c	Merge remote-tracking branch 'upstream/master' into prevent-null-lookup	2019-03-13 14:13:50 +09:00
Dean Herbert	f4c505709a	Use parsing methods in more places ... Limiting scope to beatmap decoding for this pass. Can expand to skin/storyboard in the future.	2019-03-13 13:56:31 +09:00
Dean Herbert	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09:00
Dean Herbert	93b774104a	Fix NaN handling	2019-03-13 11:30:33 +09:00
Dean Herbert	73d9aef5bd	Fix filename	2019-03-12 20:38:04 +09:00
Dean Herbert	cc09ecbfcf	Increase validation performed on .osu files to avoid hard crashes	2019-03-12 20:31:15 +09:00
smoogipoo	059397ac50	Remove unnecessary early return for maching beatmap IDs	2019-03-12 14:40:13 +09:00
Dan Balasescu	05358fa458	Merge branch 'master' into ensure-import-sanity	2019-03-12 14:24:07 +09:00
Dean Herbert	59897bbeb5	Refactor UpdateableBeatmapBackground lookup logic for clarity ... Closes #4401. Alternative to #4439.	2019-03-11 19:00:39 +09:00
Dean Herbert	d0ae75af6e	Add tests and fix scenario where all matching are contained by duplicate candidate	2019-03-11 18:13:33 +09:00
Dean Herbert	3a8c32d41b	Add the ability for ArchiveModelManager to re-import even when existing entry is present	2019-03-11 17:04:18 +09:00
Dean Herbert	9df27f3a5f	Merge branch 'master' into prevent-null-lookup	2019-03-09 11:14:54 +09:00
Jamie Taylor	800007c378	Set DummyWorkingBeatmap difficulties to 0 for better fallback display	2019-03-08 18:17:50 +09:00
Jamie Taylor	ab0ac7a82a	Pass through timeBeforeLoad instead of hardcoding	2019-03-06 19:12:37 +09:00
Jamie Taylor	06b65e00c4	Prevent null beatmap from creating an extra drawable	2019-03-06 19:12:28 +09:00
Jamie Taylor	eb80549782	Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites	2019-03-06 19:12:22 +09:00
Dean Herbert	9441f88033	Use actual reference to default beatmap for fallback ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-03-06 13:01:37 +09:00
David Zhao	89987210c3	Merge remote-tracking branch 'upstream/master' into LobbyList	2019-03-05 18:59:38 +09:00
David Zhao	34b2553b95	Remove redundant boolean	2019-03-05 18:59:25 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
David Zhao	52558c5cf6	Fix metadata potentially being null	2019-03-05 16:59:02 +09:00
David Zhao	166a8c8bbb	Add back fallback behavior for match creation	2019-03-05 16:41:59 +09:00
David Zhao	fc62877fdc	Fall back to default background	2019-03-05 15:51:43 +09:00
David Zhao	7c53c7b602	Remove local background logic	2019-03-05 15:33:39 +09:00
David Zhao	aecbc31ffa	Use BeatmapSetCoverType.List for lobby listing	2019-03-05 12:08:14 +09:00
Dean Herbert	0ff17103e8	Merge branch 'master' into update-difficulty-brackets	2019-03-05 10:16:18 +09:00
Dean Herbert	d4041d5d42	Automate includes of files in ArchiveModelManager use cases	2019-03-01 10:25:21 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Dean Herbert	56697339b3	Merge branch 'master' into fix-disabled-set-crash	2019-02-27 11:14:42 +09:00
Dean Herbert	314f35b0c5	Further simplify import messaging	2019-02-25 18:42:08 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	4e06d5c7cd	Avoid fatal exceptions being thrown on download failure ... Closes #4313.	2019-02-24 00:33:11 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
Dean Herbert	452caabd40	Apply suggestions from code review ... Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>	2019-02-22 17:06:49 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	7e41fbc29b	Remove LegacyDifficultyCalculator	2019-02-21 13:12:37 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +09:00
Poyo	66de451b53	Update difficulty color bracket thresholds	2019-02-14 02:19:41 -08:00
Dean Herbert	88ffc78103	Restructure	2019-02-11 19:11:34 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	327a34f12a	Merge remote-tracking branch 'upstream/master' into download-tracking-component ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs	2019-01-31 18:45:09 +09:00
Dean Herbert	baea9691cc	Fix baetmap downloads using too much memory	2019-01-29 18:34:10 +09:00
Dean Herbert	28f529ca19	Rename to host	2019-01-25 20:24:32 +09:00
Dean Herbert	c3b73d2d53	ALlow null host	2019-01-25 12:08:31 +09:00
Dean Herbert	bda5a90252	Readonly variable	2019-01-25 11:50:52 +09:00
Dean Herbert	6b3d53750c	Fix remaining cases of not using host-created TextureLoaderStore	2019-01-25 11:48:28 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	7d6d7cf457	Merge remote-tracking branch 'upstream/master' into download-tracking-component ... # Conflicts: # osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs	2019-01-23 11:06:29 +09:00
Dean Herbert	5ea6e8e247	Allow full osu!direct usage regardless of supporter status for now	2019-01-22 14:22:38 +09:00
Dean Herbert	21e79f51b1	Remove necessity of BeatmapSetDownloader	2019-01-18 14:28:06 +09:00
smoogipoo	cf8bcb7ba2	Add explicit beatmap -> scores relationship rather than relying on cascades	2019-01-08 17:53:43 +09:00
Dean Herbert	49ba4e5a14	Merge branch 'master' into update-framework	2019-01-07 18:51:54 +09:00
Dean Herbert	f6018294b5	Update framework	2019-01-07 18:50:27 +09:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
Dean Herbert	55607634b4	Fix covers being loaded even when off-screen	2018-12-28 13:30:05 +09:00
Dean Herbert	cf079690e5	Use LargeTextureStore for online retrievals	2018-12-27 22:13:51 +09:00
smoogipoo	eaba9e1378	Fix mode icon not being updated for correct ruleset	2018-12-27 18:16:30 +09:00
Dean Herbert	26834abd33	Fade and no schedule	2018-12-26 21:18:55 +09:00
Dean Herbert	c902c1587a	Add tests and modify fallback logic	2018-12-25 19:17:32 +09:00
smoogipoo	96c9e5f209	Make DefaultBeatmap readonly	2018-12-25 18:34:45 +09:00
Dean Herbert	9542e3e24a	Add Updateable beatmap sprite	2018-12-25 18:04:13 +09:00
Dean Herbert	b5ba74a628	Add more specific checks	2018-12-05 02:12:15 +09:00
Dean Herbert	c7c5837ec1	Fix GetWorkingBeatmap potentially loading same beatmap twice ... This could be seen when using the previous/next buttons in the MusicController while at song select.	2018-12-05 01:45:32 +09:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
Dean Herbert	059e9e180b	Apply review	2018-11-30 18:07:15 +09:00
Dean Herbert	aa7a665317	Merge remote-tracking branch 'upstream/master' into scoredatabase	2018-11-30 17:20:23 +09:00
Dean Herbert	e82ad3539b	Move JsonIgnore specification to interface	2018-11-30 16:39:25 +09:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
Dean Herbert	ab2b2493a1	Move hashing functionality to ArchiveModelManager	2018-11-28 19:21:36 +09:00
Dean Herbert	ce660b6d67	Add skin de-duplication	2018-11-28 19:01:22 +09:00
smoogipoo	14ff4bc26a	Move primary key attribute to IHasPrimaryKey	2018-11-28 13:19:23 +09:00
Dean Herbert	7755242a43	Merge branch 'master' into osuTK	2018-11-21 18:53:11 +09:00
smoogipoo	5ad96afea0	Fix crashes when importing/deleting from model managers	2018-11-20 18:09:23 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	e964a555d0	Fix DummyWorkingBeatmap having unrealistic defaults	2018-10-29 15:26:28 +09:00
smoogipoo	8703db5cc1	Rename HitObjectMask -> SelectionMask	2018-10-26 13:31:23 +09:00
smoogipoo	8a2a6a3ecb	Preserve the beatmap's version	2018-10-23 14:59:21 +09:00
smoogipoo	05d89180c8	Move brace on new line	2018-10-22 12:17:23 +09:00
Paul Teng	86b29064c6	Change DownloadState only when Download is possible	2018-10-18 08:51:05 -04:00
Dean Herbert	a2b8904b1e	Merge branch 'master' into database-standardize-paths	2018-10-18 16:21:45 +09:00
smoogipoo	1bebceada7	Unroll loop for the last control point	2018-10-17 11:55:34 +09:00
smoogipoo	336b6fa38e	Perform a custom binary search to remove thread-unsafeness	2018-10-17 11:23:18 +09:00
smoogipoo	d431dd59a8	Cleanups	2018-10-17 10:53:21 +09:00
smoogipoo	41391a6627	Fix beatmap conversion tests failing	2018-10-16 12:01:58 +09:00
smoogipoo	72aaaa4a74	PointSearch -> SearchPoint	2018-10-16 10:29:53 +09:00
HoLLy	710b0a4664	Remove unnecessary PathSanitise call	2018-10-12 15:30:24 +02:00
HoLLy	bb07630743	Merge branch 'master' into database-standardize-paths	2018-10-12 14:08:25 +02:00
smoogipoo	fb1760f580	Simplify linq from beatmap conversion	2018-10-11 20:29:37 +09:00
smoogipoo	ec9f23ab73	Make IBeatmap.HitObjects an IReadOnlyList	2018-10-11 19:53:07 +09:00
smoogipoo	7b2a30f5b4	Reduce some high-profile enumerator allocations	2018-10-11 19:52:03 +09:00
smoogipoo	10fb1d20d1	Remove allocation of control point with every binarysearch	2018-10-11 19:08:00 +09:00
smoogipoo	5b544a0c97	Remove allocation of string.IndexOf()	2018-10-11 18:37:48 +09:00
smoogipoo	bd99a87298	Use ordinal comparison in LegacyBeatmapDecoder	2018-10-11 17:48:47 +09:00
smoogipoo	0c4403ef16	Don't apply version offset during diff calc	2018-10-11 13:53:49 +09:00
HoLLy	b35f88b8ba	Standardize AudioFile and BackgroundImage paths	2018-10-09 17:49:18 +02:00
smoogipoo	9facf707be	Add diffcalc beatmap decoder	2018-10-09 11:49:24 +09:00
smoogipoo	b7499fa956	Allow TimingControlPoint to be overridden	2018-10-09 11:34:38 +09:00
smoogipoo	794501cc5a	Fix incorrect result of ternary	2018-10-05 12:06:24 +09:00
smoogipoo	40c17cfa5a	Remove ugly if-statement	2018-10-05 11:55:59 +09:00
smoogipoo	cb1703c6e2	Fix colours with alpha components not being parsed	2018-10-05 11:19:01 +09:00
smoogipoo	04cd68f970	Hide status pill when status is none	2018-09-20 12:53:45 +09:00
smoogipoo	7b8094d731	Move text size/padding out of constructor	2018-09-20 12:53:45 +09:00
Dan Balasescu	d3bb78d139	Merge branch 'master' into add-rank-status	2018-09-18 14:10:42 +09:00
smoogipoo	aba1de8b1a	Cleanup	2018-09-18 12:54:07 +09:00
Hanamuke	3e7006ec1f	Fix fonction name	2018-09-14 19:52:32 +02:00
Hanamuke	c8d3776c79	Remove uneeded brackets	2018-09-14 19:46:04 +02:00
Hanamuke	347cb0a1b5	Check for type conversion, mais the update recursive	2018-09-14 19:41:29 +02:00
Hanamuke	1c2cc3837a	Compute combo for nested Objects. Display fruit depending on Combo for ... osu!catch	2018-09-13 21:52:15 +02:00
Unknown	638a2e5ba8	populate Status for Beatmap + BeatmapSet ... also added Status to APIBeatmap + APIBeatmapSet	2018-09-13 11:57:40 +02:00
Unknown	13b988053a	add status column to BeatmapInfo + BeatmapSetInfo	2018-09-13 10:10:58 +02:00
Unknown	221a99d886	fix StatusPill not setting text when initially set with NONE	2018-09-13 10:07:26 +02:00
smoogipoo	9b0954ab81	Reference whether texture is available rather than disposed	2018-09-11 11:28:02 +09:00
Dean Herbert	7cca990be4	Merge remote-tracking branch 'upstream/master' into framework-image-changes	2018-09-07 18:56:00 +09:00
Dean Herbert	bb67f1a361	Merge remote-tracking branch 'upstream/master' into add-skin-import-delete	2018-09-07 18:18:03 +09:00
Dean Herbert	81da7ce298	Merge branch 'master' into add-skin-import-delete	2018-09-07 16:48:01 +09:00
Dean Herbert	2c0ba401d5	Add ability to click on imported complete notification to present last import	2018-09-07 16:30:11 +09:00
Dean Herbert	01389f0443	Merge remote-tracking branch 'upstream/master' into update-framework-with-everyrthing	2018-09-06 18:04:58 +09:00
Dean Herbert	4e012042ab	Fix renaming variables too eagerly	2018-09-06 17:57:09 +09:00
Dean Herbert	29b0d62f21	Changes in line with framework refcount changes	2018-09-06 13:29:57 +09:00
Dean Herbert	89a92ab7eb	Fix potential thread-safety issue	2018-09-06 13:27:53 +09:00
Dean Herbert	8d9e0ff1c3	Remove async WorkingBeatmap logic	2018-09-06 12:51:23 +09:00
Dean Herbert	9b753bb429	Merge pull request #3321 from peppy/fix-importing ... Fix order of import set conflict checks	2018-09-05 18:51:15 +09:00
Dean Herbert	144e80dff6	Add "import all skins from stable" option (and mass delete)	2018-09-03 10:10:04 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
Dean Herbert	b1a3dfedd1	Reduce async-await pairs	2018-08-30 14:41:16 +09:00
Dean Herbert	0d4aa37a91	Fix order of import set conflict checks	2018-08-28 02:53:32 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
Dean Herbert	8204d3292e	Log to correct file	2018-08-25 14:50:46 +09:00
smoogipoo	aeb4d47c06	Remove skipping part of message	2018-08-24 18:07:39 +09:00
smoogipoo	99574ecad8	Softly handle errors when no beatmap file exists in archive	2018-08-24 17:57:39 +09:00
smoogipoo	55370165c0	Compare with invariant culture	2018-08-24 10:12:30 +09:00
smoogipoo	407968bb7e	Log the format line when a decoder isn't found	2018-08-24 10:03:56 +09:00
smoogipoo	8f261988f7	Log all files when no beatmap files in archive error occurs	2018-08-23 10:59:21 +09:00
Dean Herbert	985528d08b	Merge branch 'master' into more-import-logging	2018-08-22 16:30:55 +09:00
Dean Herbert	f1c6dfd735	Change grammar slightly	2018-08-22 16:22:29 +09:00
Dean Herbert	c6df93c438	Merge branch 'master' into invalid-obj-types	2018-08-22 16:21:17 +09:00
smoogipoo	551581e5cd	Skip invalid hitobject types, log error instead	2018-08-22 15:59:58 +09:00
smoogipoo	bdd618a99d	Log the archive when failing to create model	2018-08-22 15:42:43 +09:00
smoogipoo	df84889646	Handle invalid origins as Anchor.TopLeft	2018-08-22 14:50:03 +09:00
smoogipoo	541c4daa81	Use ordinal string comparison in hot paths	2018-08-21 11:10:54 +09:00
ekrctb	cf4cb934cf	Merge branch 'master' into fix-combo-colours	2018-08-16 10:45:54 +09:00
smoogipoo	4dfb63023f	Update with recent changes	2018-08-15 15:49:48 +09:00
smoogipoo	d0c9e2257b	Merge remote-tracking branch 'origin/master' into framework-storage-update	2018-08-15 14:54:09 +09:00
smoogipoo	539dd3134f	Fix beatmap processor not setting combo index on first object	2018-08-15 11:48:50 +09:00
smoogipoo	ce77473910	Simplify usage of ConvertHitObjectParser	2018-08-15 10:24:56 +09:00
smoogipoo	e360985d73	Replace variables into the entire line	2018-08-14 18:15:09 +09:00
smoogipoo	b8824a41b5	Fix certain control points not being replaced	2018-08-14 11:44:53 +09:00
jorolf	123f304cf1	update storage usages	2018-08-02 19:24:17 +02:00
Dean Herbert	b7de922896	Merge branch 'master' into open-downloaded-beatmas	2018-07-28 12:44:34 +09:00
Dean Herbert	95cca046fb	Merge branch 'master' into open-downloaded-beatmas	2018-07-25 12:38:49 +02:00
Dean Herbert	da8fc0ee5d	ToLower -> ToLowerInvariant	2018-07-25 07:37:05 +02:00
Dean Herbert	5364a6148a	Use ToUpperInvariant	2018-07-24 14:42:06 +02:00
Dean Herbert	ab9340f4be	Fix usage of culture local ToUpper causing incorrect display on Turkish machines ... Closes #3098.	2018-07-24 11:37:43 +02:00
Dean Herbert	d561f54282	Merge branch 'master' into per-object-css	2018-07-23 03:01:17 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	a2f744b05e	Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas	2018-07-21 00:03:17 +09:00
Dean Herbert	7fea2b3a8b	Add ToList	2018-07-20 16:38:02 +09:00
smoogipoo	c087a73f40	Implement per-hitobject custom sample banks	2018-07-20 15:12:44 +09:00
smoogipoo	de8d05bb0c	Remove unnecessary setting of sample name to same value	2018-07-20 15:12:21 +09:00
Dean Herbert	693ba8e994	Add more ToString output	2018-07-19 18:43:11 +09:00
Dean Herbert	68614f1512	Ensure online IDs are validated for imports that don't have an associated archive too	2018-07-19 13:41:34 +09:00
Dean Herbert	e3fb781a5a	Fix ArchiveModelManager's model import method not running import logic	2018-07-18 12:59:22 +09:00
Dan Balasescu	7a2dc3c674	Merge branch 'master' into clickable-download-notifications	2018-07-17 13:29:16 +09:00
Dean Herbert	84c13174d9	Merge branch 'master' into use-has-flags	2018-07-17 03:50:40 +09:00
Dean Herbert	40a1f8313e	Merge branch 'master' into make-notifications-quieter	2018-07-17 03:24:47 +09:00
Dean Herbert	f4591c6d0b	Merge branch 'master' into fix_color_parsing	2018-07-17 00:25:32 +09:00
morguldir	fc77e01ba9	Fix formatting, make StripComments protected ... Don't strip comments when calling ParseLine	2018-07-16 16:35:55 +02:00
Dean Herbert	98cddc0c04	Fix some legacy cases	2018-07-16 16:26:37 +09:00
Dean Herbert	dbc538abbe	Use Enum.HasFlag ... With .NET core 2.0+ this is as efficient as the ugly code we've been using.	2018-07-16 16:18:46 +09:00
Dean Herbert	a117b323e2	Merge branch 'master' into make-notifications-quieter	2018-07-16 13:15:07 +09:00
Dean Herbert	a12c47536b	Change default to being important	2018-07-16 13:00:21 +09:00
morguldir	429306aa87	Fix casing, use ordinal string comparison when stripping comments	2018-07-16 01:54:20 +02:00
morguldir	87a4bf3d92	Remove using directive for regex in LegacyDecoder	2018-07-16 01:08:30 +02:00
morguldir	6c861a1638	Strip comments from everything except metadata	2018-07-16 01:04:41 +02:00
Dean Herbert	6698f320fb	Merge branch 'master' into download-button-state	2018-07-13 22:05:26 +09:00
Dean Herbert	a1a077398c	Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications	2018-07-13 21:04:17 +09:00
Dan Balasescu	69acb4f10e	Merge branch 'master' into improve-difficulty-icons	2018-07-13 18:27:43 +09:00
Dean Herbert	159b26509b	Improve visuals of difficulty icons	2018-07-13 17:15:06 +09:00
Dean Herbert	09be9c2ed2	Merge remote-tracking branch 'upstream/master' into naoey-download-button-state	2018-07-13 14:52:10 +09:00
Criminalllz	a9f8c2acb8	Use Regex to only care about colors and commas when parsing a color.	2018-07-12 20:36:57 +02:00
Dean Herbert	7157428882	Fix import failure of beatmap sets containing duplicate beatmap difficulties	2018-07-11 02:59:00 +09:00
Dean Herbert	1418d1369f	Add the ability to click completed download notifications to select beatmap ... Closes #2731.	2018-07-11 01:32:10 +09:00
Dan Balasescu	f5504914cc	Merge branch 'master' into fix-hitsound-fallback	2018-07-10 17:19:16 +09:00
Dan Balasescu	ce219cda53	Merge branch 'master' into fix-beatmap-links	2018-07-10 16:20:59 +09:00
Dean Herbert	ba258b8a05	Fix lack of fallback logic for custom bank samples ... Closes #2966. --- Was causing some beatmaps to not play all of their hitsounds	2018-07-10 02:56:22 +09:00
Dean Herbert	e223074876	Fix import failures if single set has multiple conflicting OnlineBeatmapIDs ... Resolves #2970.	2018-07-09 00:24:55 +09:00
Dean Herbert	91777b04d8	Merge branch 'master' into download-button-state	2018-07-08 14:15:47 +09:00
Dean Herbert	625b9ead4c	Fix links from profile top scores to beatmaps not working correctly	2018-07-05 21:00:23 +09:00
Dean Herbert	44aecdc3a0	Rename method to EquivalentTo	2018-07-05 15:00:02 +09:00
Dean Herbert	d11ba2df0e	Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks	2018-07-05 14:53:31 +09:00
naoey	2a0b1f3615	Update direct panel download button for new design ... - Add a download failed event to BeatmapManager - Make DownloadButton aware of all 3 possible download states - Change button appearance based on each state	2018-07-03 20:18:09 +05:30
smoogipoo	8b0c6a4c85	Make SampleControlPoint clone the existing SampleInfo	2018-07-02 14:17:19 +09:00
Dan Balasescu	37495c34fa	Fix possible nullreference	2018-07-02 13:51:47 +09:00
smoogipoo	b664d3ef81	Fix time being a part of controlpoint change comparisons	2018-07-02 13:34:25 +09:00
smoogipoo	aea50e770b	Use .Equals everywhere	2018-07-02 13:34:14 +09:00
Dean Herbert	812929fa05	Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess	2018-07-02 13:10:42 +09:00
Dean Herbert	b7893bc994	Remove unnecessary comments	2018-07-02 13:07:44 +09:00
smoogipoo	9f85c55915	Merge remote-tracking branch 'origin/master' into legacy-custom-banks	2018-07-02 12:34:51 +09:00
Dan Balasescu	8abcf68188	Merge branch 'master' into fix-negative-online-set-id	2018-06-29 18:29:36 +09:00
smoogipoo	99068debc4	Split out into separate interface + add xmldocs	2018-06-29 13:24:33 +09:00
smoogipoo	756cabd5d0	Add a preprocess method to BeatmapProcessor	2018-06-29 12:45:48 +09:00
tgi74000	b0739023ce	Add BeatmapInfo's stable defaults to fix compatibility with old maps	2018-06-28 19:02:38 +02:00
smoogipoo	94f1b2eeb8	Only custom sample banks > 1 modify the filename	2018-06-28 18:29:17 +09:00
smoogipoo	3a9a82c80c	Add back legacy custom sample banks	2018-06-28 18:29:12 +09:00
smoogipoo	781095b96b	Encapsulate the method to apply SampleControlPoints to SampleInfos	2018-06-28 18:29:07 +09:00
smoogipoo	2882981f9c	Implement and use equality comparers for ControlPoint	2018-06-28 18:28:59 +09:00
Dean Herbert	be2d3d6ad4	Merge branch 'master' into fix-supporter-naming	2018-06-28 17:34:21 +09:00
smoogipoo	2f2bd59844	Remove editor functionality from VirtualBeatmapTrack ... /shrug	2018-06-28 11:47:41 +09:00
smoogipoo	87e8074cd2	Use a const for excess length	2018-06-28 11:46:56 +09:00
smoogipoo	c0c94e24b9	Use VirtualBeatmapTrack in testcases	2018-06-28 11:45:48 +09:00
Dean Herbert	5ad122bfec	Fix beatmaps importing with -1 as online set ID	2018-06-28 10:28:35 +09:00
Joehu	8518fce4a9	Fix osu!supporter naming	2018-06-27 17:57:55 -07:00
smoogipoo	5640385f48	Update the length once during construction	2018-06-27 16:12:49 +09:00
smoogipoo	b4b28f8ae8	Make GetWaveform() not hard bail if errors occur	2018-06-27 16:07:18 +09:00
smoogipoo	b88c4464cb	Make virtual beatmap tracks approximate beatmap length	2018-06-27 16:02:49 +09:00
Dean Herbert	f7f17bab78	Merge branch 'master' into catch-droplet-fix	2018-06-26 19:29:15 +09:00
Dean Herbert	5d3b51b8d4	Merge branch 'master' into api-offline-early-return	2018-06-22 13:16:30 +09:00
Dean Herbert	3819ecb2be	Update framework	2018-06-19 20:19:52 +09:00
Dean Herbert	5d105cd08d	Avoid errors being logged when importing beatmaps while logged out	2018-06-15 17:23:03 +09:00
smoogipoo	8f7334874c	Fix up performance calculators	2018-06-14 16:04:48 +09:00
Dan Balasescu	cbb883614a	Merge branch 'master' into catch-droplet-fix	2018-06-13 15:18:52 +09:00
Dan Balasescu	0a35a81c2d	Merge branch 'master' into populate-missing-online-ids	2018-06-12 13:11:21 +09:00
Dean Herbert	ecc0f5e575	Use Any() instead of Count()	2018-06-08 20:54:09 +09:00
Dean Herbert	064e8190be	Add basic documentation	2018-06-08 20:53:58 +09:00
Dean Herbert	66d28aa9fc	Merge branch 'master' into beatmap-set-downloader	2018-06-08 16:28:25 +09:00
Dean Herbert	a775d00bd8	Add online fetch support for online IDs	2018-06-08 15:59:45 +09:00
Dean Herbert	955a78e76d	Remove OnlineBeatmapSetID from BeatmapInfo ... It should now be retrieved via the linked BeatmapSetInfo	2018-06-08 15:26:27 +09:00
Dean Herbert	8220e0c79a	Remove OnlineBeatmapSetID from BeatmapMetadata	2018-06-08 12:46:34 +09:00
Dean Herbert	f3c9049660	Merge branch 'master' into disallow-beatmap-change	2018-06-07 15:34:19 +09:00
smoogipoo	3745f9000b	Merge remote-tracking branch 'origin/master' into remove-decoder-offset	2018-06-07 13:37:19 +09:00
Dean Herbert	2e23da1dfa	Merge branch 'master' into beatmap-set-downloader	2018-06-06 20:32:58 +09:00
smoogipoo	72cc53aded	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
smoogipoo	4086ff7313	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs	2018-06-06 18:26:51 +09:00
DrabWeb	7819be7957	Remove unused using.	2018-06-06 03:28:07 -03:00
DrabWeb	188272e15d	Replace OnAlreadyDownloading with returning a bool from Download.	2018-06-06 03:18:42 -03:00
DrabWeb	80951eae68	Inherit BeatmapSetDownloader from Component.	2018-06-05 18:09:26 -03:00
DrabWeb	d8154f8cad	Fix BeatmapSetInfos with OnlineBeatmapSetID set to null being marked as downloaded.	2018-06-04 21:11:27 -03:00
DrabWeb	01c5060bcf	Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables	2018-06-04 20:30:54 -03:00
Dan Balasescu	0f7b23d765	Add param explanatory blurb to xmldoc	2018-06-04 11:11:07 +09:00
Dean Herbert	4b604bf055	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
Dean Herbert	645f6efce7	Fix web request failures not being correctly handled at an APIRequest level	2018-06-03 13:01:52 +09:00
Dean Herbert	ae6f603d16	Merge branch 'master' into match-panel-with-web	2018-06-01 21:31:18 +09:00
Joehu	1095669a55	Match panel with web	2018-05-31 08:09:19 -07:00
DrabWeb	6781b81336	Cleanup.	2018-05-31 05:48:42 -03:00
Dean Herbert	42bc6b6b2e	Merge branch 'master' into updateable-beatmap-set-cover	2018-05-31 17:33:31 +09:00
Dan Balasescu	cd3ca68f03	Merge branch 'master' into song-selet-enumerable	2018-05-31 14:38:04 +09:00
Dean Herbert	a28e71995d	Offload database query to task ... Allows song select to load a touch faster, in theory.	2018-05-30 16:15:57 +09:00
Dean Herbert	0adc16f9bd	Handle online ID mismatches and clashes on beatmap import	2018-05-29 16:26:50 +09:00
Dean Herbert	47d88a48a2	Add logging on import processes	2018-05-29 16:26:42 +09:00
DrabWeb	e920b8d577	Add UpdateableBeatmapSetCover.	2018-05-28 19:11:26 -03:00
smoogipoo	3a5228af43	Make GameBeatmap late-bind its AudioManager for ctor Beatmap access	2018-05-28 17:55:41 +09:00
smoogipoo	8ae2a3696f	Apply platform universal offset at player level	2018-05-28 03:31:46 +09:00
ekrctb	9f2e09dae4	Move PostProcessing to after control points applied and nested hit objects created.	2018-05-25 18:57:06 +09:00
smoogipoo	542eb848b0	Fix GetBoundCopy on IGameBeatmap not working	2018-05-24 12:42:58 +09:00
smoogipoo	a25462e10f	Fix testcase audio + dependency overrides not working	2018-05-23 18:52:09 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
smoogipoo	e6e3758304	Fix HR mod affecting original beatmap difficulty ... Fixes #2575.	2018-05-18 18:11:52 +09:00
smoogipoo	397d93660a	Don't deep-clone beatmapinfo/control points	2018-05-17 13:17:33 +09:00
smoogipoo	0f817d18d4	Add explanatory comment	2018-05-16 13:59:51 +09:00
smoogipoo	cf44357bdb	Use a stable sort for hitobjects	2018-05-16 13:30:48 +09:00
smoogipoo	995fda9b6f	Move base classes to osu.Game.Rulesets.Difficulty namespace	2018-05-15 17:38:08 +09:00
smoogipoo	e1b8a1589b	Fix TimeRate not being considered for performance calculation	2018-05-14 11:15:14 +09:00
smoogipoo	2bab08c437	Fix post-merge errors	2018-05-11 14:08:17 +09:00
smoogipoo	73465c35fa	Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2018-05-11 14:05:40 +09:00
Dean Herbert	8a6ef0dabb	Merge branch 'master' into beatmap-conversion-rework	2018-05-10 19:10:07 +08:00
Dean Herbert	40c1b24b3d	Move IBeatmap to its own file	2018-05-10 19:51:40 +09:00
smoogipoo	5489976c20	Implement ruleset-specific beatmap statistics	2018-05-07 15:51:08 +09:00
smoogipoo	30a3f4f29f	Fix not being able to convert beatmaps with 0 hitobjects	2018-05-07 15:27:45 +09:00
smoogipoo	68441f1ef0	Output ruleset instantiation info	2018-05-07 14:28:30 +09:00
smoogipoo	ad2c2a5fe6	Restore star difficulty calculation	2018-05-07 12:25:21 +09:00
smoogipoo	794418432f	Fix incorrect method name	2018-05-07 11:22:25 +09:00
smoogipoo	db3e48c194	Rename GetBeatmap() to GetPlayableBeatmap()	2018-05-07 10:40:30 +09:00
smoogipoo	9128e64c9a	Rename OriginalBeatmap back to Beatmap	2018-05-07 10:29:38 +09:00
smoogipoo	7e83c75888	Add xmldoc	2018-05-07 10:23:32 +09:00
smoogipoo	b68ee39136	Reword beatmap conversion error	2018-05-07 10:18:47 +09:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	77e661489d	Merge branch 'i-beatmap' into beatmap-conversion-rework	2018-05-07 10:00:24 +09:00
smoogipoo	1aefd71b65	Merge remote-tracking branch 'origin/master' into i-beatmap	2018-05-07 09:58:53 +09:00
Adonais Romero González	06c6f55995	Apply offset to end times on legacy converter	2018-04-30 00:43:32 -07:00
Dean Herbert	b16e25c3e9	Add error handling on a per-line level in LegacyDecoder ... Resolves #2306.	2018-04-20 18:32:24 +09:00
smoogipoo	03a5df84c6	Initial rework of beatmap conversion process	2018-04-19 22:04:12 +09:00
smoogipoo	66b3b295e7	Use IBeatmap wherever possible	2018-04-19 20:44:38 +09:00
smoogipoo	e666a82e1f	Fix cloning	2018-04-19 18:59:09 +09:00
smoogipoo	ac64f9d958	Remove LegacyBeatmap	2018-04-19 18:58:45 +09:00
smoogipoo	b5a55a0dce	Make an interface for beatmaps	2018-04-19 18:58:40 +09:00
smoogipoo	ffbe6f2e37	Merge remote-tracking branch 'origin/master' into fix-rank-status ... # Conflicts: # osu.Game/Beatmaps/RankStatus.cs # osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs # osu.Game/Overlays/Direct/FilterControl.cs # osu.Game/Overlays/DirectOverlay.cs	2018-04-18 14:16:58 +09:00
tgi74000	1feba556eb	CI: unused directive	2018-04-16 14:25:43 +02:00
tgi74000	9b36cf2066	Review changes	2018-04-16 14:14:40 +02:00
tgi74000	b23b0a445b	Add support for replay mods	2018-04-13 15:41:35 +02:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Joehu	f18594887b	Move enum to SearchBeatmapSetsRequest	2018-04-12 07:49:23 -07:00
Joehu	461e063f19	Rename RankStatus to BeatmapSearchCategory	2018-04-11 22:50:39 -07:00
Joseph Madamba	767ecb4422	Fix rank status	2018-04-10 00:11:53 -07:00
Dean Herbert	ddba7254ca	Merge remote-tracking branch 'upstream/master' into linq	2018-04-03 13:05:08 +09:00
smoogipoo	fd9480cfb6	Handle timingpoint FormatException	2018-04-02 20:08:40 +09:00
smoogipoo	d24d81d8a9	De-pluralize some methods	2018-04-02 20:07:18 +09:00
Huo Yaoyuan	b842f682eb	Use Linq.Append and Prepend.	2018-04-02 12:06:34 +08:00
DrabWeb	19bc6b9168	Merge https://github.com/ppy/osu into beatmap-set-status	2018-03-27 18:13:58 -03:00
DrabWeb	506e27a30e	Cleanup.	2018-03-27 17:59:58 -03:00
DrabWeb	eb374c5774	Add beatmap set online status and display it in direct panels and the beatmap set overlay.	2018-03-26 21:04:45 -03:00
Dean Herbert	0e669c9a3f	Fix many warnings	2018-03-24 18:23:22 +09:00
smoogipoo	ffa712dccb	Fix post-merge issues	2018-03-24 15:19:45 +09:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	b8022070e8	Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin	2018-03-22 16:24:56 +09:00
Dean Herbert	7bdca0ff39	Merge remote-tracking branch 'upstream/master' into accent-colour-properties	2018-03-22 15:07:28 +09:00
Dean Herbert	e39b7b8d35	Don't hard-crash when an unknown section is encountered in a legacy file	2018-03-22 12:58:02 +09:00
Dean Herbert	504c3ff0ba	BeatmapSkin -> LegacyBeatmapSkin	2018-03-22 12:50:48 +09:00
Dean Herbert	78a8f60b39	IHasComboIndex -> IHasComboInformation	2018-03-22 12:35:17 +09:00
Dean Herbert	d1c2aa71d0	Add beatmap sample override support	2018-03-20 16:24:06 +09:00
Dean Herbert	9a0fc9e29a	Move combo colours completely out of beatmap	2018-03-20 16:24:06 +09:00
Dean Herbert	dbcf755618	Make Beatmaps parsable as skins	2018-03-20 16:05:29 +09:00
Dean Herbert	c38c26eacb	Move combo index processing to BeatmapProcessor	2018-03-20 15:57:43 +09:00
Dean Herbert	62e908e22c	Add default separator character	2018-03-19 20:06:44 +09:00
Dean Herbert	1d7be2ad0b	Fix incorrect variable name	2018-03-14 10:14:42 +09:00
Dean Herbert	16eab2eebf	Fix combo colours not working until now	2018-03-13 19:19:08 +09:00
Dean Herbert	e43de68ad3	Move colour parsing to LegacyDecoder	2018-03-13 19:13:50 +09:00
Dean Herbert	d6fa7d69d7	Add missing fonts section	2018-03-13 16:13:07 +09:00
Dean Herbert	8cbcdeb665	Merge branch 'master' into mania-difficulty	2018-03-12 14:07:14 +09:00
Dean Herbert	9f644571ea	Merge branch 'master' into mania-difficulty	2018-03-12 13:31:48 +09:00
smoogipoo	81186f8423	Apply beatmap converter mods in DifficultyCalculator	2018-03-12 13:06:42 +09:00
Dean Herbert	1bcda4930e	Add back beatmap version set	2018-03-12 11:33:12 +09:00
Dean Herbert	217dd2ecdc	Initial push for better decoders	2018-03-09 21:24:15 +09:00
Dean Herbert	70a16667b6	Fix difficulty calculator regression when applying mods	2018-03-08 12:57:36 +09:00
Dean Herbert	7b18e8a5ca	Merge branch 'master' into fix-taiko-conversion	2018-03-06 01:16:47 +09:00
smoogipoo	d44dc1a4f9	Fix SliderMultiplier/SliderTickRate parsing inaccuracy	2018-03-05 16:01:05 +09:00
Dean Herbert	e46f363fdc	Fix failing unit test	2018-03-04 22:46:50 +09:00
Dean Herbert	bc0bc8d459	Add legacy timing offsets ... These have been in release builds since January, but implemented in a hacky way. This brings them with a sane implementation.	2018-03-04 21:57:50 +09:00
smoogipoo	a2c239d5e3	Rename to IBeatmapConverter, move to separate file	2018-03-02 20:19:47 +09:00
smoogipoo	797d03a65f	Implement basic structure for beatmap conversion testing	2018-03-02 13:13:00 +09:00
Dean Herbert	b8ea4b11ab	Adjust range further ... This is not a great idea.	2018-03-01 00:39:59 +09:00
Dean Herbert	572d3b1316	Move bpm clamping to TimingControlPoint, adjust range to 1-10000bpm ... In line with stable editor restrictions	2018-02-28 22:53:28 +09:00
Dean Herbert	5b4fef0180	Add bare minimum sanity checking of beatmap input values to make broken maps load ... Resolves ppy/osu#1988.	2018-02-28 18:12:24 +09:00
Dean Herbert	968291c61e	Sort hitobjects imported from legacy beatmps ... Apaprently some ranked maps contain unordered hitobjects. We probably never want to allow for this.	2018-02-28 18:11:28 +09:00
Dean Herbert	6f44db6de0	Clamp at DifficultyControlPoint ... This is what stable did.	2018-02-28 18:10:38 +09:00
Dan Balasescu	34f76a4136	Merge branch 'master' into storyboard-improvements	2018-02-19 15:40:09 +09:00
Dean Herbert	a7915e7041	Fix typo	2018-02-19 14:00:48 +09:00
Dean Herbert	21b641b302	Give storyboards a BeatmapInfo to reduce weird method calls ... Also removes unnecessary background texture (the actual storyboard background spec wasn't implemented correctly anyway).	2018-02-16 12:09:23 +09:00
Dean Herbert	1b13be1372	Cleanups and xmldoc additions	2018-02-15 16:24:14 +09:00
Dean Herbert	8c1d581fb3	Fix hiding beatmaps not refreshing correctly	2018-02-15 16:15:40 +09:00
Dean Herbert	89cf794f98	Add a lower level ConsumableItems implementation	2018-02-15 16:15:40 +09:00
Dean Herbert	d3dd31dadb	Make deletion and purging logic even more global	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	d8f84fcca3	Give ArchiveReader a filename	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	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	8c42225646	Fix outdated xmldoc	2018-02-13 15:08:51 +09:00
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
Dean Herbert	a738664167	Add interface for database context factory	2018-02-12 23:10:05 +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
Dean Herbert	edc3638175	DatabaseWriteUsage	2018-02-12 17:55:11 +09: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
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +09:00
smoogipoo	17aa915c77	Rename DifficultyRange parameters	2018-02-08 13:57:45 +09:00
smoogipoo	e45b26c742	Cleanup/minify HitWindows	2018-02-02 19:35:44 +09:00
james58899	fa800f0977	fix storyboard path	2018-01-23 18:18:54 +08:00
Dean Herbert	a931d6e381	Merge branch 'master' into fix-user-download-cancel	2018-01-22 16:27:26 +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	d8275c4f9b	Fix beatmap query not including beatmap files	2018-01-16 18:20:46 +09:00
Aergwyn	ae1adfd2f2	remove unnecessary empty lines ... codefactor.io \(o.o)/ also one unnecessary semicolon	2018-01-12 19:30:34 +01:00
Dan Balasescu	86581b6451	Remove extra braces	2018-01-11 17:02:09 +09:00
james58899	4fa038aa27	if not storyboard file	2018-01-11 13:53:41 +08:00
james58899	fbffc8bb89	fix load storyboard in osu file	2018-01-10 18:55:04 +08:00
Dean Herbert	58626e3b30	Allow rulesets to create their own instantiation info	2018-01-10 17:04:07 +09:00
Dean Herbert	4c0259a040	Merge branch 'master' into fix-storyboard-variables	2018-01-09 11:50:03 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	af86220dcc	Merge remote-tracking branch 'origin/master' into update-branch	2018-01-05 12:08:50 +09:00
Dean Herbert	01038bd9bb	Merge branch 'master' into mania-rc-cleanup	2018-01-05 10:18:15 +09:00
smoogipoo	5eb2dc3d64	Cleanup some possible CI errors ... Not sure why these aren't being detected on master right now - they should be...	2018-01-05 01:20:24 +09:00
smoogipoo	36e9232472	Merge master into netstandard	2018-01-05 00:42:48 +09:00