1056 Commits

Author	SHA1	Message	Date
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
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