1231 Commits

Author	SHA1	Message	Date
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
james58899	0158246ba1	AppVeyor	2018-01-04 19:23:00 +08:00
james58899	dcc4e863ab	move variables to StoryboardDecoder	2018-01-04 19:04:52 +08:00
james58899	89fe567496	use FileSafety.PathSanitise	2018-01-03 17:57:24 +08:00
smoogipoo	bd171926d6	Remove AvailableColumns from ManiaRulesetContainer ... Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.	2018-01-03 18:44:25 +09:00
Dan Balasescu	7ba59d9d56	Merge branch 'master' into fix-import-context-state	2018-01-03 14:21:04 +09:00
Dean Herbert	7154efa1c6	Refresh import context on import error	2018-01-02 12:31:21 +09:00
Dean Herbert	f2d302f8dc	Create a LargeTextureStore for cached (but not atlased) global textures ... Also - Fixes first transition depth being incorrect. - Improves smoothness of transitions (and adds a slight delay to offset from screen switches).	2017-12-31 07:05:04 +09:00
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
smoogipoo	ddee9e992a	Merge remote-tracking branch 'origin/master' into proper-taiko-hitsounds	2017-12-27 13:04:10 +09:00
smoogipoo	b95d7fc2cd	Revert "Make ControlPointInfo return a set default control point" ... This reverts commit 3113a55a98.	2017-12-27 12:41:59 +09:00
Dean Herbert	3182c22c7d	Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info	2017-12-26 20:36:22 +09:00
smoogipoo	d479955e20	Fix spelling error	2017-12-26 20:01:02 +09:00
smoogipoo	3113a55a98	Make ControlPointInfo return a set default control point	2017-12-26 19:33:01 +09:00
smoogipoo	836d807f4f	Give SampleControlPoint a 100% volume by default	2017-12-26 19:32:20 +09:00
Dean Herbert	3c8d30f8e6	Add a dialog offering to import beatmaps from stable	2017-12-26 00:52:11 +09:00
Dean Herbert	9ca03c0209	Simplify and tidy sample retrieval ... Less static weirdness	2017-12-23 16:46:02 +09:00
Dean Herbert	5026c7a95e	SoundControlPoint -> SampleControlPoint	2017-12-23 16:34:34 +09:00
Aergwyn	ed827d5424	more visual tests for BeatmapInfoWedge ... also fix Author showing when not wanted	2017-12-22 12:33:52 +01:00
Dan Balasescu	a3d947301b	Merge branch 'master' into beatmap-serialization	2017-12-22 07:38:05 +09:00
Dean Herbert	620e9737c3	Avoid many many unnecessary enumerations	2017-12-21 22:33:16 +09:00
smoogipoo	866d1c6e0f	Remove now unused references	2017-12-21 22:13:18 +09:00
FreezyLemon	e4ead36544	Added completion text	2017-12-21 13:01:14 +01:00
FreezyLemon	cbc1aacf5c	Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add	2017-12-21 13:00:11 +01:00
smoogipoo	b2c0b013aa	Remove migration setting in favour of export option in the editor	2017-12-21 19:56:12 +09:00
smoogipoo	a3fcc0b60c	Back to using SortedLists	2017-12-21 19:40:41 +09:00
smoogipoo	cb7e192aff	Determine SampleInfo defaults in DrawableHitObject	2017-12-21 16:02:33 +09:00
smoogipoo	58859f2ffb	Rework registration/instantiation of decoders to not rely on reflection	2017-12-21 15:34:00 +09:00
smoogipoo	22f8853f49	Serialize star difficulty for now	2017-12-21 14:44:51 +09:00
smoogipoo	e8e5e8270b	Rename decoder	2017-12-21 14:19:37 +09:00
smoogipoo	bfa4f1a2c3	Apply changes in line with master changes	2017-12-21 13:59:03 +09:00
smoogipoo	c99ea32574	Merge branch 'master' into beatmap-serialization	2017-12-21 13:39:39 +09:00
FreezyLemon	3644eda9a9	Changed notification from "installed" to "imported" on beatmap download	2017-12-19 11:34:23 +01:00
FreezyLemon	ba614883ea	used Any() instead of manually checking count == 0 (CI)	2017-12-18 11:16:57 +01:00
FreezyLemon	f898481523	Changed existing implementations to have a custom CompletionText	2017-12-18 11:14:07 +01:00
FreezyLemon	d2b80fdbfc	Moved "undelete all" logic to BeatmapManager and added a progress notification	2017-12-18 10:55:07 +01:00
Dean Herbert	4c45102d61	Merge branch 'master' into undelete-button-add	2017-12-18 16:28:32 +09:00
Dean Herbert	49ce42d90c	Add ToString() overrides on many classes to make debugging easier	2017-12-16 16:14:01 +09:00
Dean Herbert	1146ba02d7	Make GetWorkingBeatmap return a sane default rather than exception on lookup failure	2017-12-15 14:36:51 +09:00
Dean Herbert	78dd975a35	Initial carousel infrastructue changes	2017-12-15 14:36:51 +09:00
Dean Herbert	69653c7f4f	Don't use nested ternary if	2017-12-12 13:07:34 +09:00
Dean Herbert	8dea999908	Order difficulty icons by ruleset	2017-12-11 21:35:47 +09:00
Dean Herbert	b10240d7ef	Handle the case where the selected panel is no longer a valid selection better	2017-12-11 21:31:26 +09:00
Dean Herbert	970e55fc4a	Update difficulty icons on headers to match filtered difficulties	2017-12-11 20:49:27 +09:00
Dean Herbert	f58c554d19	Add per-difficulty filtering support ... Filters based on selected ruleset	2017-12-11 20:22:10 +09:00
Dean Herbert	3880c7157b	Merge branch 'master' into fix-missing-metadata	2017-12-11 16:04:08 +09:00
Dean Herbert	08727266e7	Merge branch 'master' into add-ruleset-shortname	2017-12-11 15:41:11 +09:00
Dean Herbert	9069f1ccba	Merge branch 'master' into most-played-beatmaps-section	2017-12-11 12:12:23 +09:00
FreezyLemon	8cbd6f32cb	Moved menu music hash property back to intro and changed check (before undeleting) to "Protected" field.	2017-12-10 11:31:37 +01:00
FreezyLemon	1691a74b14	Merge branch 'undelete-button-add' of https://github.com/freezylemon/osu into undelete-button-add	2017-12-10 11:26:31 +01:00
FreezyLemon	e1c04a1f44	Added check for "menu music beatmap hash" before undeleting so circles.osu doesn't get imported on Undelete. Also moved the const property to BeatmapManager.	2017-12-08 12:50:04 +01:00
Dean Herbert	679134c030	Add ShortName to rulesets	2017-12-08 18:55:25 +09:00
FreezyLemon	d93a1fdaae	Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add	2017-12-08 10:30:42 +01:00
Dean Herbert	31884a951a	Remove "redundant" parenthesis	2017-12-08 15:53:59 +09:00
Dean Herbert	2e1dfa16a2	Fix checks disallowing import of older beatmaps with no embedded online IDs	2017-12-08 14:59:32 +09:00
Aergwyn	95955d68ef	rephrased description of local context checking	2017-12-07 14:14:50 +01:00
Aergwyn	1dcbfab18e	removed redundant comment	2017-12-07 13:56:37 +01:00
Aergwyn	76c09ae59e	added comments for local context checking	2017-12-07 13:44:47 +01:00
Dean Herbert	f2eef6621a	Merge branch 'master' into fix-missing-metadata	2017-12-07 19:23:51 +09:00
Dean Herbert	2a1a9b9f1f	Fix post-merge issue	2017-12-07 17:26:39 +09:00
smoogipoo	09f54b06ac	Just don't serialize Author altogether for now	2017-12-07 15:55:22 +09:00
smoogipoo	0ba8988580	Don't serialize Author + add SerializableAttributes	2017-12-07 15:32:39 +09:00
Dean Herbert	44ee11e75f	Merge branch 'master' into fix-beatmap-carousel-lag	2017-12-07 15:30:50 +09:00
smoogipoo	f5f7658e90	Don't serialize TotalBreakTime	2017-12-07 14:40:28 +09:00
smoogipoo	dfc10d42e8	Merge remote-tracking branch 'origin/master' into beatmap-serialization	2017-12-07 12:49:27 +09:00
smoogipoo	f1dbcc4f1a	Remove misleading comments	2017-12-07 12:23:53 +09:00
smoogipoo	0e3b001b13	Make maps with storyboards decode correctly with OsuJsonDecoder	2017-12-07 10:37:51 +09:00
smoogipoo	a8db3a9484	Add progress notification to migration	2017-12-07 04:09:03 +09:00
smoogipoo	b6b26cfe25	Add basic method to migrate beatmaps to the new JSON format	2017-12-07 03:04:36 +09:00
Dean Herbert	34596b3368	Rename and comment for clarification	2017-12-06 21:47:48 +09:00
smoogipoo	ed5f7e5353	Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder	2017-12-06 16:28:34 +09:00
smoogipoo	f9e34dfa3d	Assume that control points are already sequentially-ordered ... Fixes up deserializing.	2017-12-06 16:24:09 +09:00
Dean Herbert	04ae64e9fd	Add missing IsCompleted check to ensureValid	2017-12-06 16:20:49 +09:00
smoogipoo	887b81148d	Don't ignore RulesetId for now	2017-12-06 14:14:07 +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
smoogipoo	d2dc7c8937	Add OsuJsonDecoder	2017-12-06 00:38:12 +09:00
smoogipoo	b584178e85	Make Beatmap ISerializable and add more JsonIgnores	2017-12-06 00:37:37 +09:00
Aergwyn	ad8cd7eb5d	fix possible NullReference? ... AppVeyor pls?	2017-12-02 17:04:42 +01:00
Aergwyn	cc76c58f5f	fall back to .osu file for storyboard if no .osb file is present ... + CI fixes	2017-12-02 16:05:39 +01:00
Aergwyn	c466296b14	reverted split at Decoder, moved logic down ... I'm done experimenting, sorry - `Decoder` only returns a "Beatmap"`Decoder` now - "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder` - moved parse methods down in the hierarchy where I forgot to do that - renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`	2017-12-01 22:05:01 +01:00
Aergwyn	a49f3479a2	Split retrieving of beatmap and storyboard decoder ... Storyboard works again. Not satisfied with the solution though.	2017-12-01 19:11:52 +01:00
Aergwyn	db50ad794e	CI adjustments ... - removing unnecessary `using`s - name Fields/Methods according to rules - removing unnecessary initializations	2017-12-01 17:58:11 +01:00
Aergwyn	806c0e3b26	restructured OsuLegacyDecoder into LegacyDecoder ... Beatmap works, Storyboard not...	2017-12-01 17:43:33 +01:00
Dean Herbert	7532795935	Lock during validity checks	2017-12-01 22:43:49 +09:00
Aergwyn	7080711cb2	remove unnecessary using	2017-11-30 20:13:10 +01:00
Aergwyn	be018a63c6	remove unnecessary lines	2017-11-30 19:17:11 +01:00
Aergwyn	c16925059c	split parsing a beatmap and parsing a storyboard	2017-11-30 19:16:13 +01:00
Aergwyn	016057ab01	readd storyboard to beatmap + minor cleanup	2017-11-30 16:49:53 +01:00
FreezyLemon	b09ba19d3f	Used the already-existing private method to undelete a mapset	2017-11-30 11:02:53 +01:00
FreezyLemon	bf386598b6	Added a new "undelete" button that restores every beatmap with "DeletePending" set to true.	2017-11-30 10:58:32 +01:00
jorolf	22403cac89	Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section	2017-11-29 23:09:04 +01: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
smoogipoo	267bb75458	Merge remote-tracking branch 'Aergwyn/master' into netstandard	2017-11-29 23:45:29 +09:00
smoogipoo	a9cc156d7a	Merge remote-tracking branch 'origin/master' into performance-calculator	2017-11-28 21:38:26 +09:00
Dean Herbert	23b4d2163c	Fix spelling and grammar	2017-11-28 21:30:03 +09:00
Dean Herbert	bd88df2722	Add note about sequential execution of ConvertHitObject	2017-11-28 18:33:41 +09:00
Aergwyn	c058065a3a	remove unnecessary using	2017-11-27 20:24:01 +01:00
Aergwyn	d87235a289	prevent inserting duplicate metadata	2017-11-27 20:08:16 +01:00
Dean Herbert	7877f42763	Merge remote-tracking branch 'upstream/master' into new-sounds-and-more	2017-11-27 17:59:24 +09:00
Dean Herbert	2dcc3b9e74	Merge branch 'master' into fix-missing-metadata	2017-11-27 12:28:33 +09:00
Dean Herbert	f189de437a	Simplify blending assignment	2017-11-27 10:01:44 +09:00
Unknown	ae55d392de	only use == for comparion on primitive types	2017-11-26 19:37:46 +01:00
Dean Herbert	9c90d9ca45	Add panel hover effects	2017-11-26 17:21:23 +09:00
Dean Herbert	4067b6129b	Add visual highlighting on song select panel hover ... Prerequisite for adding hover sound effects. Didn't feel right without this change.	2017-11-26 17:14:13 +09:00
Unknown	5da1466e28	requested changes ... use IEquatable<T> instead of overriding Equals and `==` operator for primitive types.	2017-11-25 15:05:59 +01:00
jorolf	a1cc18f98c	Merge branch 'master' into most-played-beatmaps-section	2017-11-24 22:51:11 +01:00
jorolf	21d5d10738	replace BeatmapResponse with BeatmapInfo	2017-11-24 22:48:56 +01:00
Aergwyn	e3a230320a	compare metdata and remove duplicate from beatmap to prevent redundant storage	2017-11-23 19:46:58 +01:00
Dean Herbert	2f3e4a27c6	Merge branch 'master' into improve-user-ratings-calculations	2017-11-23 20:55:55 +09:00
Dean Herbert	4986ad73f7	Merge remote-tracking branch 'upstream/master' into load-optimization	2017-11-23 18:44:17 +09:00
Dean Herbert	d93911ae97	Improve user ratings calculations to make more sense ... Closes #1552.	2017-11-23 18:10:08 +09:00
FreezyLemon	2cc2323791	Style changes (removing newline from before second constructor parameter)	2017-11-23 09:12:23 +01:00
Dean Herbert	6e51664544	Merge branch 'master' into beatmap-overlay-download	2017-11-23 17:11:28 +09:00
Aergwyn	0df5432f5e	removed line that set metadata per beatmap to null	2017-11-22 21:45:18 +01:00
jorolf	22348a3d67	Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section	2017-11-22 21:14:11 +01:00
FreezyLemon	7d428875b8	Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor)	2017-11-22 15:46:04 +01:00
smoogipoo	de7c571be3	Merge remote-tracking branch 'origin/master' into netstandard	2017-11-22 19:46:17 +09:00
Aergwyn	e5dfe4ff2e	Make error more verbose when beatmap import fails (#1537) ... Add name of beatmap set to error message if import fails	2017-11-22 19:35:25 +09:00
Dean Herbert	517a9ec40f	Merge branch 'master' into async-beatmap-panels	2017-11-22 19:05:42 +09:00
FreezyLemon	870807c265	Switched over to the new LoadWrapper class for all delayed loading.	2017-11-21 16:17:33 +01:00
Dean Herbert	5e70b7a9f7	Add async load methods for WorkingBeatmap properties	2017-11-21 22:34:53 +09:00
Dean Herbert	2603219350	Load beatmap carousel panels asynchronously	2017-11-21 22:30:09 +09:00
smoogipoo	f9ad4b6acb	Make categoryDifficulties return doubles to improve decimal accuracy	2017-11-21 19:55:09 +09:00
smoogipoo	b3bf6e7bee	Merge master into netstandard	2017-11-21 16:39:21 +09:00
Dean Herbert	4f6263ef86	Make many internal classes and methods public ... This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.	2017-11-21 12:06:16 +09:00
smoogipoo	aac41d2de6	Disable resharper inspections on case-by-case basis	2017-11-20 18:55:48 +09:00
Dean Herbert	8919e98d13	Fix CI issue	2017-11-20 11:32:20 +09:00
jorolf	fe7f9cccaa	BeatmapSetCover can display other types of covers now	2017-11-19 14:16:00 +01:00
smoogipoo	d2ab0621f3	Make osu.Game + rulesets compile with netstandard	2017-11-19 13:46:51 +09:00
Dean Herbert	d704e9cf7e	Ensure we correctly handle importing beatmaps/sets when the onlineID already exists locally	2017-11-19 01:45:17 +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	95fd323c6b	Fix ManiaDifficultyCalculator possibly failing due to nullref	2017-11-17 14:37:06 +09:00
smoogipoo	ac6213d1fa	CI fixes	2017-11-17 14:26:33 +09:00
smoogipoo	7892eefd68	Fix up mod application + beatmap/hitobject references	2017-11-17 14:23:52 +09:00
smoogipoo	cc1720241e	Fix DifficultyCalculator using incorrect mods	2017-11-17 12:36:51 +09:00
smoogipoo	5781b45b39	Set TimeRate after mod application	2017-11-17 12:36:17 +09:00
smoogipoo	18f2e92a48	Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator	2017-11-17 12:36:13 +09:00
smoogipoo	62155e6dd5	Make DifficultyCalculator support mod applications ... Fixes https://github.com/ppy/osu/issues/476.	2017-11-17 12:36:07 +09:00
naoey	5aeeb9aac6	Merge remote-tracking branch 'upstream/master' into beatmap-overlay-download	2017-11-15 17:38:38 +05:30
Dean Herbert	6933a41b75	Add back high resolution cover regressions	2017-11-15 13:26:02 +09:00
Dean Herbert	6ef60d0b4e	Merge branch 'master' into beatmap-overlay-scores	2017-11-15 13:18:32 +09:00
smoogipoo	cd8d7af9db	Clean up a few warnings in preparation for net-standard	2017-11-14 13:06:25 +09:00
Unknown	16e48ed187	Hook up download logic with BeatmapSetOverlay download buttons. ... - Add noVideo option to DownloadBeatmapSetRequest - Make Download fire an event with new download instead of returning it	2017-11-12 18:41:10 +05:30
EVAST9919	7280f77a02	Trim whitespace	2017-11-10 03:06:21 +03:00
EVAST9919	c2f3971188	Extend Beatmap Set Response	2017-11-10 03:01:11 +03:00
Miterosan	567cd6316c	beatmap can not be null in DifficultyColouredContainer.cs	2017-11-07 23:17:45 +01:00
Miterosan	b2e49c1e71	line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:17:26 +01:00
Miterosan	13e75780d7	beatmap and stream can not be null in OsuLegacyDecoder.cs	2017-11-07 23:17:07 +01:00
Miterosan	1e6f1d07d2	line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:16:42 +01:00
Miterosan	a15ab785f2	palette can not be null in DifficultyColouredContainer.cs	2017-11-07 23:16:19 +01:00
Miterosan	36ce287b88	panels can not be null in BeatmapSetHeader.cs	2017-11-07 23:15:51 +01:00
Miterosan	0f539d24f0	Localisation can not be null in BeatmapSetHeader.cs	2017-11-07 23:15:21 +01:00
Miterosan	dc317139c9	beatmap can not be null in BeatmapSetHeader.cs	2017-11-07 23:15:02 +01:00
Miterosan	bc94179032	workingbeatmap can not be null in BeatmapBackgroundSprite.cs	2017-11-07 23:14:22 +01:00
Miterosan	d7dee57886	set can not be null in BeatmapSetCover.cs	2017-11-07 23:13:56 +01:00
Miterosan	dd3874daa8	beatmap can not be null in BeatmapPanel.cs	2017-11-07 23:13:32 +01:00
Miterosan	289a1346fc	beatmap can not be null in DifficultyIcon.cs	2017-11-07 23:13:09 +01:00
Miterosan	a8acea9cdb	stream can not be null in BeatmapDecoder.cs	2017-11-07 23:12:30 +01:00
Miterosan	8dc24a52a7	beatmap and line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:11:33 +01:00
Miterosan	d27dced3af	beatmap and line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:11:16 +01:00
Miterosan	34083baa4d	beatmap and line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:11:04 +01:00
Miterosan	0287d3d7a0	beatmap and line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:10:54 +01:00
Miterosan	cf296d4bb2	beatmap and line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:10:41 +01:00
Miterosan	2f47b336e2	beatmap and line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:10:30 +01:00
Miterosan	080c3fabba	BeatmapSet and manager can not be null in BeatmapGroup.cs	2017-11-07 23:10:06 +01:00
Miterosan	1f620886cb	beatmap and line can not be null in OsuLegacyDecoder.cs	2017-11-07 23:09:16 +01:00
Miterosan	840946d160	list can not be null in ControlPointInfo.cs	2017-11-07 23:08:24 +01:00
smoogipoo	04b271cce9	Migrate osu.Game project to VS2017 project structure	2017-10-30 22:24:11 +09:00
Dean Herbert	b89112c2a1	Fix incorrect alignment	2017-10-25 23:56:18 +09:00
Dean Herbert	4d4b505ef7	Add AsNoTracking to common read-only queries	2017-10-25 23:56:05 +09:00
Dean Herbert	e62928102c	Merge remote-tracking branch 'upstream/master' into user-iqueryable	2017-10-25 23:49:56 +09:00
Dan Balasescu	e2ee76332f	Merge branch 'master' into fix-threaded-context-issues	2017-10-25 23:30:28 +09:00
Dean Herbert	2d0f4d3859	Fix OnlineBeatmapSetID not being correctly populated	2017-10-25 22:14:16 +09:00
Dean Herbert	195d75d045	Flip flop let's expose IEnumerables for now	2017-10-25 22:12:20 +09:00
Dean Herbert	4e1922c556	Fix query methods not using IQueryable/Expressions ... No database-level where clauses were being used in many cases they should be.	2017-10-25 22:10:45 +09:00
Dean Herbert	5001e9f264	Fix Hide/Restore/Delete etc.	2017-10-25 22:08:34 +09:00
Dan Balasescu	d927e57af6	Merge branch 'master' into fix-direct-import-stall	2017-10-25 21:48:27 +09:00
Dan Balasescu	946288ba2e	Merge branch 'master' into fix-direct-import-stall	2017-10-25 21:46:00 +09:00
Dan Balasescu	05e1a7a5f8	Merge branch 'master' into online-beatmap-id-sanity	2017-10-25 21:38:33 +09:00
TocoToucan	5107489cda	Remove DatabaseBackedStore Reset functions	2017-10-25 15:12:14 +03:00
TocoToucan	63fe569afa	Remove DatabaseBackedStore Prepare functions	2017-10-25 14:53:20 +03:00
Dean Herbert	66f1d2fb2e	Ensure all parsed "Online" IDs are above zero or null ... Some .osu file sources (or database sources) may be in a bad state. We want to get these ones right as they cannot be enforced by the database itself (via FKs or constraints).	2017-10-25 14:34:39 +09:00
Dean Herbert	f1f7557f6e	Add importing state to download notification	2017-10-25 11:49:00 +09:00
Dean Herbert	040fa3aa15	Fix import after direct download being scheduled to update thread ... Caused a stall as experienced in #1364.	2017-10-25 11:43:30 +09:00
Dean Herbert	c765785d00	Mark several long-running tasks as long-running	2017-10-25 11:42:55 +09:00
Dean Herbert	e7931ef4c7	Add a default icon when a ruleset isn't present	2017-10-23 17:32:28 +09:00
Dean Herbert	4a68dd88cb	Centralise BeginTransaction and disable transaction use for now	2017-10-23 14:53:13 +09:00
Dean Herbert	29fcd210aa	Centralise transaction committing	2017-10-22 16:17:40 +09:00
Dean Herbert	980a6c93b4	Merge branch 'master' into fix-ef-hiding	2017-10-20 14:24:46 +09:00
Dean Herbert	93b2fc6dc5	Fix issues with deletion ... Main fix is avoiding nullrefs being thrown when metadata isn't present on a beatmap (quite a common scenario).	2017-10-20 11:18:08 +09:00
Dean Herbert	7f83cf6780	Fix hiding not always working ... Because we are not sharing a single context, we need to use Update to attach the entity to the local context.	2017-10-20 11:16:45 +09:00
Dean Herbert	f7d0df1743	Fix beatmap difficulty and metadata deletion	2017-10-19 17:50:46 +09:00
Dean Herbert	12900a8b15	Remove unnecessary second call to AutoTransactionsEnabled	2017-10-19 15:53:11 +09:00
Dean Herbert	5d5ea5fb2e	Fix all remaining db structure issues	2017-10-19 14:05:11 +09:00
Dean Herbert	71d614b813	FIx missing columns yet again	2017-10-18 21:57:54 +09:00
Dean Herbert	b73b4755eb	Ignore r# locked context inspection here	2017-10-18 18:41:04 +09:00
Dean Herbert	668f68dd63	Remove some unnecessary update calls	2017-10-18 18:27:57 +09:00
Dean Herbert	4841d4a937	Fix deletion and use single context for imports and deletions for now	2017-10-18 18:27:17 +09:00
Dean Herbert	cf5290fead	Remove unnecessary locking; operations are now thread-safe	2017-10-18 13:48:15 +09:00
Dean Herbert	4193004fbf	Improve performance of imports by keeping a context hot	2017-10-17 20:29:47 +09:00
Dean Herbert	e4a066dc5f	Run cleanup tasks only on startup via manual calls	2017-10-17 19:58:33 +09:00
Dean Herbert	b9d0fb96ed	Fix cascade deletions	2017-10-17 18:26:28 +09:00
Dean Herbert	7a18d373ec	Improve performance of beatmap imports (still needs revision)	2017-10-17 17:08:42 +09:00
Dean Herbert	cf3881b18c	Fix not being able to restore hidden beatmaps via context menu	2017-10-17 15:50:52 +09:00
Dean Herbert	e487b6f82a	Standardise context retrieval	2017-10-17 15:50:42 +09:00
Dean Herbert	cd41862e3b	Add back transaction support for beatmap importing	2017-10-17 15:00:27 +09:00
Dean Herbert	66894d11ea	Connection -> context	2017-10-17 12:46:29 +09:00
Dean Herbert	c92e0e2dc1	Fix username display on beatmap panels	2017-10-17 11:24:59 +09:00
Dean Herbert	31dc5c97f2	Fix intro and duplicate inserts	2017-10-17 11:22:42 +09:00
Dean Herbert	81476ebe75	Correct and simplify BeatmapStore and BeatmapManager	2017-10-17 10:17:21 +09:00
Dean Herbert	e378d0685d	Remove weird additions	2017-10-16 20:37:10 +09:00
Dean Herbert	acc299c7b9	Correct and simplify RulesetStore	2017-10-16 17:02:31 +09:00
Dean Herbert	7049a73490	Remove ValidTypes from databased stored; explicitly expose query methods instead	2017-10-16 14:47:33 +09:00
Dean Herbert	0a6dcdd405	Fix remaining warnings	2017-10-16 13:09:10 +09:00
Dean Herbert	8a0b184dd6	Revert "Return back DatabaseBackedStore's query and populate functions" ... This reverts commit 7cf5d63cd3.	2017-10-16 12:59:59 +09:00
Dean Herbert	04e5f764a3	Revert "Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects"	2017-10-16 12:59:59 +09:00
TocoToucan	56e8c7303c	Revert "Fix inconsistent lock usage in BeatmapManager" ... This reverts commit 4a064da30f.	2017-10-16 12:59:59 +09:00
TocoToucan	4a064da30f	Fix inconsistent lock usage in BeatmapManager	2017-10-15 21:56:33 +03:00
TocoToucan	db2750592d	Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects	2017-10-15 14:01:35 +03:00
TocoToucan	7cf5d63cd3	Return back DatabaseBackedStore's query and populate functions	2017-10-15 00:40:41 +03:00
smoogipoo	9924f518b7	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game/Beatmaps/BeatmapMetadata.cs # osu.Game/osu.Game.csproj # osu.Game/packages.config	2017-10-14 16:36:37 +09:00
smoogipoo	b178be21d1	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
smoogipoo	b83d7cd4df	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs # osu.Game/Beatmaps/BeatmapInfo.cs # osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs	2017-10-14 12:38:59 +09:00
Dean Herbert	ed152c08ac	Fix regressions	2017-10-14 12:27:32 +09:00