1530 Commits

Author	SHA1	Message	Date
smoogipoo	348d88846d	Add IBeatmap<T> interface for typed hitobject retrieval	2019-08-28 20:19:22 +09:00
Dean Herbert	01aede3e29	Add comprehensive skin fallback integration testing	2019-08-28 19:57:17 +09:00
Dean Herbert	66223b9954	Merge branch 'master' into allow-fallback-to-samples-without-bank	2019-08-27 14:44:16 +09:00
Dean Herbert	289bd8e6b0	Don't return DefaultSkin on beatmap skin parsing failure	2019-08-26 14:25:35 +09:00
Dean Herbert	1d34124667	Revert all DifficultyIcon changes	2019-08-25 11:56:07 +09:00
Dean Herbert	a19a9b90ed	Simplify group filter display	2019-08-25 11:39:26 +09:00
iiSaLMaN	af4adb6339	Add xmldoc	2019-08-24 09:43:55 +03:00
iiSaLMaN	f6feef6b56	Remove redundant using directive	2019-08-24 00:33:14 +03:00
iiSaLMaN	83b6e0f30c	Implement grouped difficulty icon	2019-08-23 23:36:23 +03:00
iiSaLMaN	d4236c574f	Allow difficulty icon to be updateable	2019-08-23 23:30:54 +03:00
iiSaLMaN	f639df849f	Allow for difficulty icon to contain content	2019-08-23 23:11:36 +03:00
iiSaLMaN	7b04fb1690	StoryboardSample -> StoryboardSampleInfo	2019-08-23 14:54:39 +03:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
Ganendra Afrasya	7143497441	Match up tooltip background color with OsuTooltipContainer	2019-08-19 10:32:01 +07:00
Dean Herbert	ecc04baf14	Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip	2019-08-17 15:35:28 +09:00
Dean Herbert	87dc6499fa	Fix json decoding being a bit too eager to consume	2019-08-17 15:34:02 +09:00
Dean Herbert	097763bb1c	Add auto size duration	2019-08-17 15:29:39 +09:00
Dean Herbert	50046d5f69	Use new tooltip style	2019-08-17 15:20:27 +09:00
Dean Herbert	3dc81bdad5	Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip	2019-08-17 15:19:46 +09:00
Dean Herbert	4fa9abeece	Replace DifficultyColouredContainer with a more scalable solution	2019-08-17 15:16:24 +09:00
Dean Herbert	f355cff8bc	Apply reviews	2019-08-15 12:11:54 +09:00
Dean Herbert	7e74953784	Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip	2019-08-15 11:54:59 +09:00
Dean Herbert	ff4b271f64	Add extra quotations around output	2019-08-12 01:42:05 +09:00
Dean Herbert	ce62f6b56e	ToString should never return null	2019-08-12 01:40:11 +09:00
Unknown	cc4ee2df05	add ToString() override to Beatmap class	2019-08-11 16:41:56 +02:00
Dean Herbert	dbb3b583cf	Log error for invalid beatmap/storyboard events instead of thro… (#5611) ... Log error for invalid beatmap/storyboard events instead of throwing Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-08-09 12:56:47 +09:00
Dean Herbert	7e9c100c9b	Apply new resharper refactors	2019-08-09 12:29:33 +09:00
smoogipoo	ac2060f1cf	Throw exceptions and let LegacyDecoder handle them	2019-08-08 14:44:04 +09:00
Dan Balasescu	54ee0cabd8	Merge branch 'master' into beatmap-events	2019-08-08 14:25:41 +09:00
Dean Herbert	a2e3ab6463	Merge branch 'master' into add-bindable-for-break-times	2019-08-08 10:13:14 +09:00
iiSaLMaN	ba269a49ee	Expose break fade duration and add it in the calculation	2019-08-07 16:59:35 +03:00
David Zhao	bde89adcb7	show exception message	2019-08-07 19:45:29 +09:00
David Zhao	b8ccba02f2	Log to runtime instead	2019-08-07 19:33:54 +09:00
David Zhao	15a592e25e	Just assert doesn't throw and don't catch at LegacyDecoder	2019-08-07 19:25:40 +09:00
David Zhao	da15e19912	return on storyboard side	2019-08-07 18:40:58 +09:00
David Zhao	7bcec31ea3	mention that the event was the type	2019-08-07 17:08:41 +09:00
David Zhao	669c2462ec	Don't consider the type	2019-08-07 16:25:38 +09:00
David Zhao	66b02c0283	log type as well	2019-08-06 12:27:10 +09:00
David Zhao	cd6fe91882	Log error for invalid events	2019-08-06 10:05:21 +09:00
Dean Herbert	69c2723d90	Merge branch 'master' into refactor-conversion-test	2019-08-02 05:34:05 +02:00
smoogipoo	e2420af10c	Fix applying mods to the wrong beatmap	2019-08-01 13:37:52 +09:00
smoogipoo	0108700793	Make beatmap conversion test use WorkingBeatmap	2019-08-01 12:44:10 +09:00
smoogipoo	bc80fa11bb	Mode IApplicableToBeatmap application to WorkingBeatmap	2019-08-01 12:41:46 +09:00
Dean Herbert	53ecb2ae82	Reduce notification span during beatmap imports	2019-07-26 13:48:29 +09:00
Andrei Zavatski	2a17ed5e18	Merge remote-tracking branch 'refs/remotes/ppy/master' into favourite-beatmap	2019-07-22 14:32:37 +03:00
smoogipoo	a631aac664	Fix workingbeatmap's disposal potentially null-refing	2019-07-22 15:01:01 +09:00
Andrei Zavatski	de8ac9a428	Simple implementation	2019-07-21 21:41:07 +03:00
StanR	1e04fcc6b5	Apply fixes	2019-07-11 17:47:09 +03:00
Dean Herbert	72da615dde	Fix track transfer not running when beatmap is retrieved from c… (#5296) ... Fix track transfer not running when beatmap is retrieved from cache	2019-07-11 22:53:07 +09:00
StanR	cd7c03c13a	Add genre and language sections to beatmapset overlay	2019-07-11 16:44:48 +03:00
iiSaLMaN	e73f22eff8	Convert length retrieved from online to milliseconds	2019-07-09 17:53:34 +03:00
iiSaLMaN	1485c273ab	Describe the xmldoc mo	2019-07-09 17:31:15 +03:00
iiSaLMaN	f3329f4d79	Use a more readable code for calculating length	2019-07-09 17:22:21 +03:00
iiSaLMaN	11ef65e3e2	Remove unnecessary extension	2019-07-08 11:57:02 +03:00
iiSaLMaN	b62e69d170	Calculate length inside BeatmapManager	2019-07-08 11:56:48 +03:00
Dean Herbert	16c993579b	Fix track transfer not running when beatmap is retrieved from cache	2019-07-08 17:12:34 +09:00
iiSaLMaN	129899f419	Add a BPM property in BeatmapInfo	2019-07-08 10:43:35 +03:00
iiSaLMaN	2d0c924bdf	Add xmldoc for MaxStarDifficulty and MaxLength	2019-07-08 09:35:12 +03:00
iiSaLMaN	79ddb8d5d3	Change to a more convenient xmldoc	2019-07-08 09:23:01 +03:00
iiSaLMaN	90d5484818	Return BPM back to OnlineInfo ... Revert commit of "Move BPM out of OnlineInfo"	2019-07-08 09:10:41 +03:00
iiSaLMaN	729f0901f7	Move Length out of OnlineInfo	2019-07-07 20:25:36 +03:00
iiSaLMaN	3ea9629daf	Move BPM out of OnlineInfo	2019-07-07 20:11:44 +03:00
iiSaLMaN	b4ef64fa61	Add sorting by Length	2019-07-07 18:26:56 +03:00
iiSaLMaN	65c8249c94	Add beatmap extension for calculating length	2019-07-07 18:25:52 +03:00
iiSaLMaN	188c80374e	Add sorting by BPM	2019-07-07 18:14:23 +03:00
Salman Ahmed	040dbfd2c1	Merge branch 'master' into remove-unnecessary-fading	2019-07-06 15:59:44 +03:00
iiSaLMaN	6fd3ad5c1d	Remove unnecessary fading	2019-07-06 12:10:30 +03:00
Dean Herbert	598b0d668b	Merge branch 'master' into import-stable-scores	2019-07-05 15:54:33 +09:00
Dean Herbert	8346c50ce1	Rename delete method and improve xmldoc	2019-07-05 13:55:25 +09:00
Dean Herbert	32bb963393	Lock WorkingBeatmap cache to avoid threading issues	2019-07-04 14:33:00 +09:00
Dean Herbert	7575047db8	Merge branch 'master' into import-stable-scores	2019-07-04 01:00:42 +09:00
Dean Herbert	8e0b5f1622	Fix weird merge conflict	2019-07-02 23:21:13 +09:00
Dan Balasescu	2fafe9a651	Merge branch 'master' into async-beatmap-load	2019-07-02 23:19:10 +09:30
Dean Herbert	089eadb008	Add weak WorkingBeatmap cache (#5163) ... Add weak WorkingBeatmap cache Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-07-02 22:40:47 +09:00
Dean Herbert	e7a7f2f660	Add statistic for count of alive WorkingBeatmaps	2019-07-02 22:39:49 +09:00
Dean Herbert	9e33fb35e9	Fix typo	2019-07-02 22:26:08 +09:00
Dean Herbert	a6acc1f99f	Catch exception and return null for safety ... .	2019-07-02 22:26:08 +09:00
Dean Herbert	0b66f13902	Add todo about beatmap load cancellation	2019-07-02 22:22:33 +09:00
Dean Herbert	a26b14a4f8	Move finaliser inside disposal region	2019-07-02 22:21:56 +09:00
Dean Herbert	31b1480263	Merge branch 'master' into async-beatmap-load	2019-07-02 20:44:53 +09:00
Dean Herbert	60ea3d4e1a	Fix skinning support for combobreak	2019-06-30 21:58:30 +09:00
HoLLy	12350d18b5	Don't remove imported archives by default	2019-06-27 14:41:11 +02:00
HoLLy	55216dffb7	Merge remote-tracking branch 'origin/master' into import-stable-scores	2019-06-27 14:07:17 +02:00
naoey	61260cf599	Hand off comparison logic for database query to implementors ... Equals overrides are not used in EF queries without running the comaprison locally instead of on the database, so to preserve that the comparison logic is instead implemented on a per manager basis.	2019-06-27 15:32:27 +05:30
Dean Herbert	ef384b8667	Add simple (weak) WorkingBeatmap cache	2019-06-27 14:09:09 +09:00
Dean Herbert	0bad86f6d9	Merge remote-tracking branch 'upstream/master' into async-beatmap-load	2019-06-27 13:58:59 +09:00
Dean Herbert	8b0aaccfe6	Add finaliser to WorkingBeatmap	2019-06-27 13:56:36 +09:00
Dean Herbert	a4929f19e5	Adjust background colour of non-loaded beatmap set cover to play better with black foreground elements	2019-06-27 12:17:28 +09:00
Dean Herbert	375a6f406d	Merge remote-tracking branch 'upstream/master' into not-available-to-download	2019-06-27 11:44:41 +09:00
naoey	f3a84de7b5	Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite	2019-06-26 18:17:53 +05:30
Dean Herbert	c34f6180e6	Merge branch 'master' into generic-download-model-manager	2019-06-26 20:37:56 +09:00
smoogipoo	cb65fc6317	Don't throw exception for non-existent files	2019-06-26 17:23:12 +09:00
Dean Herbert	88b182ab3f	Merge branch 'master' into generic-download-model-manager	2019-06-24 18:35:58 +09:00
Dean Herbert	1830362337	Move task out of ctor to avoid initialisation ordering issues	2019-06-24 17:10:50 +09:00
Dean Herbert	6d864cb47e	Load beatmap content asynchronously in the background	2019-06-24 13:38:30 +09:00
Ganendra Afrasya	d540565197	Merge branch 'master' into difficulty-icon-tooltip	2019-06-22 11:54:00 +07:00
HoLLy	f072a53e93	Merge remote-tracking branch 'origin/master' into import-stable-scores	2019-06-21 17:42:59 +02:00
HoLLy	802da225d4	Move responsibility for selecting paths to model managers	2019-06-21 17:32:47 +02:00
iiSaLMaN	a1c58b164c	Merge branch 'master' into not-available-to-download	2019-06-21 14:16:31 +03:00
Joehu	ca919f02e6	Remove bad words on code comments	2019-06-19 21:33:58 -07:00
HoLLy	15c75b4442	Add basic score import from stable	2019-06-19 18:33:51 +02:00
Dean Herbert	63d0324f96	Fix inspection	2019-06-20 01:10:14 +09:00
iiSaLMaN	5278c5f365	Merge branch 'master' into not-available-to-download	2019-06-19 01:14:32 +03:00
Dean Herbert	341dc74834	Simplify download method	2019-06-19 01:41:19 +09:00
Dean Herbert	d65c20bbdc	Merge branch 'master' into generic-download-model-manager	2019-06-19 01:29:06 +09:00
Ganendra Afrasya	aa53f14329	Make sure tooltip appear in specific cases	2019-06-17 22:44:28 +07:00
Ganendra Afrasya	1f2f26a503	Add color to star rating and star sprite icon	2019-06-16 00:40:44 +07:00
Ganendra Afrasya	515534cb34	Adding custom tooltip to DifficultyIcon	2019-06-16 00:02:26 +07:00
smoogipoo	0a79b444d9	Move metrics to beatmap set	2019-06-13 16:52:49 +09:00
smoogipoo	aef94ce9f1	Make BeatmapMetrics non-IEnumerables	2019-06-13 16:30:38 +09:00
naoey	9cd5519da3	Remove unused delegate, use model name in notifications, add more xmldoc ... - Applies a `class` constraint to the generic type in `IModelManager` - Add xmldoc	2019-06-12 19:26:06 +05:30
naoey	c5f1da0f71	Merge remote-tracking branch 'upstream/master' into generic-download-model-manager	2019-06-12 18:20:35 +05:30
naoey	951a5abccc	Merge remote-tracking branch 'upstream/master' into generic-download-model-manager	2019-06-12 17:41:16 +05:30
smoogipoo	a17d480f51	Use "beatmap" as the model name	2019-06-12 20:41:02 +09:00
smoogipoo	fd7dc9504e	Remove async when not required	2019-06-12 17:08:50 +09:00
smoogipoo	c4f54d94bc	Rename methods	2019-06-12 17:00:38 +09:00
Dean Herbert	c591a6f1fa	Rename request type to be less verbose	2019-06-12 13:30:23 +09:00
Dean Herbert	eaeeffaa86	Rename to DownloadableArchiveModelManager	2019-06-12 13:28:44 +09:00
naoey	41da491a7e	Make BeatmapSetInfo equatable	2019-06-11 23:23:40 +05:30
naoey	4a6074865e	Create interfaces for DownloadTrackingComposite to consume	2019-06-11 22:42:57 +05:30
naoey	06a558c4b7	Remove unecessary third generic and change usages to match	2019-06-11 21:11:30 +05:30
Dean Herbert	27054a744e	Fill in thread pool names	2019-06-12 00:35:13 +09:00
naoey	709ca03a08	Remove unused usings	2019-06-11 20:21:06 +05:30
naoey	802f48712d	Add ability to perform a download request with options	2019-06-11 20:14:36 +05:30
naoey	341d137f5c	Make BeatmapManager inherit from new base class	2019-06-11 19:36:08 +05:30
KingLuigi4932	70fdd4ba5b	Disable download button + Fix AppVeyor Errors	2019-06-10 21:13:37 +03:00
Dean Herbert	6ca2fcebfc	Centalise and prefix all ArchiveModelManager database logging	2019-06-10 19:34:32 +09:00
Dean Herbert	54497fb1e7	Fix prefixing spaces in BeatmapInfo's ToString when metadata is not populated yet	2019-06-10 19:33:23 +09:00
KingLuigi4932	3fc604b60a	Add Availability to BeatmapSetOnlineInfo	2019-06-10 13:18:38 +03:00
Dean Herbert	e4bad93b66	Use variable for web request concurrency for clarity	2019-06-10 13:52:09 +09:00
Dean Herbert	b79fdfc12f	Fix one more instance of improperly handled cancellation	2019-06-10 13:50:22 +09:00
Dean Herbert	b4d2d0bd0b	Simplify and combine concurrency of ArchiveModelManager	2019-06-10 13:42:33 +09:00
smoogipoo	f090e292c9	Move ArchiveModelManager import process to async flow	2019-06-10 13:42:22 +09:00
smoogipoo	a6dc5606bc	Allow beatmapsets to be sorted by date added	2019-06-05 18:17:43 +09:00
smoogipoo	4763a41c7e	Cleanups	2019-06-04 11:25:18 +09:00
smoogipoo	cea353975f	Update with further framework-side changes	2019-06-04 11:04:28 +09:00
Dean Herbert	b52276c489	Pass individual components to DummyWorkingBeatmap, not game	2019-05-31 14:51:12 +09:00
Dean Herbert	f33a5bc54c	Centralise and update WorkingBeatmap creation in test cases	2019-05-31 14:40:53 +09:00
Dean Herbert	a1cc8c448f	Update TrackVirtual consumption	2019-05-29 16:43:27 +09:00
Dean Herbert	a20eda7b5f	Fix remaining cases to work without things	2019-05-28 23:54:42 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
smoogipoo	f0d7728e81	Fix failures with a null-model	2019-05-23 17:01:22 +09:00
smoogipoo	7971261fbc	Don't create a new drawable for the first background	2019-05-23 15:59:22 +09:00
Dean Herbert	58efa7a177	Merge pull request #4729 from peppy/fix-control-point-ordering ... Fix control points with same timestamp potentially being parsed incorrectly	2019-05-21 15:33:27 +09:00
smoogipoo	7a56fe84f2	Remove ControlPoint.EquivalentTo	2019-05-21 14:27:57 +09:00
smoogipoo	7e38aabe75	Remove equivalence check from controlpoint parsing	2019-05-21 14:27:41 +09:00
smoogipoo	f1c9073338	Fix commented line check not working with whitespace	2019-05-14 16:16:55 +09:00
Dean Herbert	92f6f4d21a	Apply same fix to other methods which were missed	2019-05-13 19:04:12 +09:00
Dean Herbert	aca77a7ae2	Merge remote-tracking branch 'upstream/master' into fix-control-point-ordering	2019-05-13 18:47:05 +09:00
Dean Herbert	038e49701e	Move conditional to within BreakPeriod	2019-05-12 16:25:25 +09:00
Dean Herbert	c8f9354327	Remove incorrect deletion include ... This was causing deletions of scores without considering that scores are now managed by a ScoreManager (and have their own data dependencies).	2019-05-09 15:13:35 +09:00
Dean Herbert	66ebdbbe4c	Fix control points with same timestamp potentially being parsed incorrectly	2019-05-08 18:13:07 +09:00
smoogipoo	a00e2b18a9	Fix background unloading/reloading sometimes crashing	2019-05-07 17:24:05 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	ad124bfeec	Reimplement select mod track adjustments	2019-04-09 12:59:32 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dan Balasescu	e45c08ad23	Adjust comment	2019-03-29 14:02:19 +09:00
Dean Herbert	0439216f7e	Merge branch 'master' into stable-storyboard-ordering	2019-03-29 12:44:09 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	92184adef5	Add stable sorting of storyboard elements	2019-03-26 16:37:52 +09:00
Dean Herbert	6f1610be79	Merge branch 'master' into ruleset-container-refactor	2019-03-20 14:55:58 +09:00
Dean Herbert	461a0a5038	Merge branch 'master' into remove-unnecessary-code	2019-03-20 10:22:24 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
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