245 Commits

Author	SHA1	Message	Date
Huo Yaoyuan	dcfa98414f	Use ??=.	2019-11-12 19:56:51 +08:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
Dean Herbert	65aa7b2016	Recreate beatmap video on each consumption ... Should not be shared over multiple usages	2019-09-14 00:07:06 +09:00
Andrei Zavatski	94512fea8e	Apply naming suggestions	2019-08-31 16:20:33 +03:00
Andrei Zavatski	6e5cb8a318	implement video parsing	2019-08-30 23:19:34 +03:00
Dean Herbert	dc1046bf0c	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-30 12:53:05 +09:00
smoogipoo	ae0a5504d7	Revert unnecessary change	2019-08-29 19:43:33 +09:00
smoogipoo	6ab2b20c70	Add an interface for working beatmaps	2019-08-29 19:38:44 +09:00
Dean Herbert	01aede3e29	Add comprehensive skin fallback integration testing	2019-08-28 19:57:17 +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
smoogipoo	a631aac664	Fix workingbeatmap's disposal potentially null-refing	2019-07-22 15:01:01 +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	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	8b0aaccfe6	Add finaliser to WorkingBeatmap	2019-06-27 13:56:36 +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
smoogipoo	4763a41c7e	Cleanups	2019-06-04 11:25:18 +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
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
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
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	f6018294b5	Update framework	2019-01-07 18:50:27 +09:00
smoogipoo	8a2a6a3ecb	Preserve the beatmap's version	2018-10-23 14:59:21 +09:00
smoogipoo	9b0954ab81	Reference whether texture is available rather than disposed	2018-09-11 11:28:02 +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	b1a3dfedd1	Reduce async-await pairs	2018-08-30 14:41:16 +09:00
Dean Herbert	95cca046fb	Merge branch 'master' into open-downloaded-beatmas	2018-07-25 12:38:49 +02:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	693ba8e994	Add more ToString output	2018-07-19 18:43:11 +09:00
Dean Herbert	b7893bc994	Remove unnecessary comments	2018-07-02 13:07:44 +09:00
smoogipoo	756cabd5d0	Add a preprocess method to BeatmapProcessor	2018-06-29 12:45:48 +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	3819ecb2be	Update framework	2018-06-19 20:19:52 +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	e6e3758304	Fix HR mod affecting original beatmap difficulty ... Fixes #2575.	2018-05-18 18:11:52 +09:00
smoogipoo	68441f1ef0	Output ruleset instantiation info	2018-05-07 14:28:30 +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	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
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	dbcf755618	Make Beatmaps parsable as skins	2018-03-20 16:05:29 +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	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	b2c0b013aa	Remove migration setting in favour of export option in the editor	2017-12-21 19:56:12 +09:00
Dean Herbert	2a1a9b9f1f	Fix post-merge issue	2017-12-07 17:26:39 +09:00
Dean Herbert	44ee11e75f	Merge branch 'master' into fix-beatmap-carousel-lag	2017-12-07 15:30:50 +09:00
Dean Herbert	34596b3368	Rename and comment for clarification	2017-12-06 21:47:48 +09:00
Dean Herbert	04ae64e9fd	Add missing IsCompleted check to ensureValid	2017-12-06 16:20:49 +09:00
Dean Herbert	15ed3b4aac	Fix IsValueCreated method not cecking whether the async task was completed ... Caused potential stutters for components that relied on this check.	2017-12-06 09:49:12 +09:00
Dean Herbert	7532795935	Lock during validity checks	2017-12-01 22:43:49 +09:00
Aergwyn	96f5bd3323	remove Storyboard from Beatmap, add it to WorkingBeatmap	2017-11-29 21:54:04 +01:00
Aergwyn	cd653c1cbc	split storyboard loading into GetStoryboard()	2017-11-29 21:28:02 +01:00
Dean Herbert	d402222f17	Fix DisposeTrack and improve AsyncLazy to support disposal	2017-11-30 05:05:07 +09:00
Dean Herbert	5e70b7a9f7	Add async load methods for WorkingBeatmap properties	2017-11-21 22:34:53 +09:00
smoogipoo	ddf402d948	Add nullchecks in Disposal where population methods return nulls	2017-11-17 22:14:28 +09:00
smoogipoo	4ced1b6490	Use more of the properties	2017-11-17 22:10:24 +09:00
Dean Herbert	6b591ac77f	Add missing initialisation	2017-11-17 19:17:00 +09:00
Dean Herbert	d75e3d8e81	Use lazy for WorkingBeatmap component loading	2017-11-17 18:37:46 +09:00
smoogipoo	19b38983df	Update in-line with framework	2017-10-09 17:18:11 +09:00
Dean Herbert	3000323727	Give WorkingBeatmap's Metadata a non-null default	2017-09-19 21:41:18 +09:00
Dean Herbert	b1145272d1	Update code to support new inspectcode analysis rules	2017-09-14 12:58:32 +09:00
Dean Herbert	5b9d906ad5	Improve beatmap track disposal logic ... - [ ] Depends on https://github.com/ppy/osu-framework/pull/1035	2017-09-12 16:56:46 +09:00
Dean Herbert	18ad0956b4	Merge branch 'master' into maybefix	2017-09-11 18:23:00 +09:00
Dean Herbert	a528173943	Ensure that WorkingBeatmap's Beatmap is never null ... Also ensures some extra fields inside Beatmap have non-null defaults.	2017-09-08 19:05:14 +09:00
Dean Herbert	af0eaab78c	maybe fix	2017-09-07 01:46:07 +09:00
Dean Herbert	e75f438c29	Add difficulty application mods ... Also fixes circular references when using IJsonSerializable.	2017-08-07 08:54:54 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Dean Herbert	d6968ca09c	Remove FullyLoaded logic ... Always parse storyboards for now. Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.	2017-07-20 11:01:50 +09:00
Dean Herbert	d69470f2ae	Fix TestWorkingBeatmap broken by attempting to load storyboard	2017-07-20 09:22:39 +09:00
Huo Yaoyuan	4c26a02e99	Remove unnecessary arguments in WorkingBeatmap's constructor.	2017-05-08 16:42:53 +08:00
Huo Yaoyuan	4f49151984	Make metadata a member of WorkingBeatmap.	2017-05-06 14:52:28 +08:00
Dean Herbert	28375ed1fc	Allow transfer of previously loaded background between WorkingBeatmaps	2017-04-28 15:03:07 +09:00
ColdVolcano	4b69477531	Trim whitespace	2017-04-23 00:41:15 -05:00
ColdVolcano	1d254f4a56	Take MusicController back to life	2017-04-23 00:13:58 -05:00
Dean Herbert	3345ba180f	Update with framework rename.	2017-04-21 19:26:32 +09:00
Dean Herbert	3f832731c9	Add DoubleTime, HalfTime and Nightcore support.	2017-04-21 17:33:37 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
smoogipooo	0333e1a050	Remove unused usings.	2017-04-15 05:57:18 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	a89af273be	Make BeatmapInfo expose Ruleset instead of PlayMode.	2017-04-15 05:01:36 +09:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
Drew DeVault	267238dc27	Simplify derived classes of WorkingBeatmap	2017-03-22 06:15:32 -04:00
Drew DeVault	cc2b4c5c5b	Refactor WorkingBeatmap ... Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff from it to subclasses. Should enable us to make an OnlineWorkingBeatmap or so.	2017-03-22 05:57:08 -04:00
Dan Balasescu	879a78156d	Merge branch 'master' into mod_application	2017-03-14 12:38:55 +09:00
Dean Herbert	ba10c3a8db	Revert "Merge pull request #441 from tacchinotacchi/archive-reader" ... This reverts commit 6f20473e65, reversing changes made to c76a495d3d.	2017-03-14 11:46:34 +09:00
Dean Herbert	b2981fb729	Merge branch 'master' into mod_application	2017-03-13 22:15:26 +09:00
smoogipooo	c0e29652a6	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
Alex Amadori	309019aab3	Merge remote tracking branch 'upstream/master' into archive-reader	2017-03-07 08:41:44 +01:00
Alex Amadori	fd53d10264	Refactor ArchiveReader for extensibility	2017-03-06 23:56:08 +01:00
Dean Herbert	2de25c23b4	Make Mods IEnumerable.	2017-03-06 15:20:55 +09:00
Dean Herbert	76ef8c1a6c	Add bindable mods and autoplay support.	2017-03-06 14:52:37 +09:00
Dean Herbert	1ea21daa91	Fix PlayMode regression.	2017-03-06 14:25:38 +09:00
Dean Herbert	3b0445a244	Improve comment for PreferredPlayMode and allow null.	2017-03-06 14:08:58 +09:00
Dean Herbert	7afcac3660	Move PreferredPlayMode to WorkingBeatmap.	2017-03-05 17:45:40 +09:00
Dean Herbert	3a89348413	Centralise access to WorkingBeatmaps. ... They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).	2017-02-24 13:43:21 +09:00
Dean Herbert	d19a7813f3	Fix TestCasePlayer regression.	2017-02-22 23:27:29 +09:00
Thomas Müller	417f146386	Add difficulty calculation ... Adds base classes for difficulty calculations, hooks them up with carousel container, and adds a port of the osu difficulty calculator.	2017-02-19 17:41:51 +01:00
Dean Herbert	32ce8cf723	Audio class renames in line with framework changes.	2017-02-18 17:35:04 +09:00
Dean Herbert	11643d2e09	Remove unnecessary methods and local variables.	2017-02-13 18:30:51 +09:00
Thomas Müller	e3f35cd66e	Merge branch 'master' into osb_loading	2017-02-12 12:26:25 +01:00
Dean Herbert	37e75e9a54	Add null check when loading beatmap background.	2017-02-12 16:13:44 +09:00
Damnae	a504c73f33	Load beatmap data from an optional osb file.	2017-02-09 15:19:09 +01:00
Andrey Zavadskiy	e06aa44c4c	Warning Fixes	2017-02-09 16:18:08 +03:00
Dean Herbert	6b011a50d2	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	162e183b36	Fix some nullrefs when running visualtests with no maps loaded.	2017-01-27 00:16:02 +09:00
Dean Herbert	1d5dc77c4d	Keep reference to reader to avoid early disposal.	2016-12-18 20:47:00 +09:00
Dean Herbert	3bc38268a0	Make MusicController more async.	2016-11-22 20:47:28 +09:00
Dean Herbert	f576b4bf82	Don't use texture atlases for beatmap backgrounds.	2016-11-22 20:14:58 +09:00
Dean Herbert	7df8324957	Explicit disposal via using() to WorkingBeatmap.	2016-11-22 14:57:53 +09:00
Dean Herbert	41a84ba00c	Add finalizer logic for WorkingBeatmap for now.	2016-11-21 21:35:10 +09:00
Dean Herbert	18c0e431c1	Fix some nullrefs.	2016-11-12 18:25:58 +09:00
Huo Yaoyuan	c59cad2478	AudioEquals method for BeatmapInfo.	2016-11-07 21:52:23 +08:00
Huo Yaoyuan	e69dac7745	Fix lock object.	2016-11-05 20:21:08 +08:00
Huo Yaoyuan	f2b37e1fe7	Add lock on each property of WorkingBeatmap.	2016-11-05 20:01:46 +08:00
Dean Herbert	a11d534067	Add beatmap backgrounds.	2016-11-05 20:00:14 +09:00
Dean Herbert	8fe63689a4	Fix thread safety issue when accessing files in beatmap (zip) files.	2016-11-05 18:19:01 +09:00
Dean Herbert	5dc495e41d	Avoid accessing the beatmap too early.	2016-10-28 21:08:32 +09:00
Dean Herbert	10ef34b805	Lazy parse beatmap; Don't reload audio track if it hasn't changed.	2016-10-28 20:24:14 +09:00
Dean Herbert	74f1a9622f	Add initial game-wide beatmap flow.	2016-10-28 19:55:48 +09:00
Dean Herbert	209f09df91	Don't exception on inability to read audio track.	2016-10-28 18:03:26 +09:00
Dean Herbert	856e056515	Remove unnecessary finaliser.	2016-10-28 14:18:00 +09:00
Dean Herbert	feccb7286c	Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect.	2016-10-28 14:14:45 +09:00