2427 Commits

Author	SHA1	Message	Date
Dean Herbert	64a8992153	Merge branch 'master' into general-fixes	2017-04-18 16:19:52 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Dean Herbert	727086c0b2	Updates in-line with framework.	2017-04-18 15:34:53 +09:00
smoogipooo	7a6b062e72	Fix adding duplicate hitobjects in the case where a hit object doesn't need to be converted.	2017-04-18 14:48:18 +09:00
smoogipooo	cf404b4bcf	We shouldn't be adding null hitobjects.	2017-04-18 14:46:56 +09:00
Dan Balasescu	0dd97c433f	Trim whitespace.	2017-04-18 14:34:39 +09:00
smoogipooo	27ddf4b475	Refactor beatmap converters.	2017-04-18 14:31:06 +09:00
smoogipooo	ef5d50e7d8	mode -> ruleset.	2017-04-18 11:29:27 +09:00
smoogipooo	8844ff7ab7	CI fixes.	2017-04-18 11:20:39 +09:00
smoogipooo	d04353aed0	Legacy mania hit objects don't have a "column", this should be determined by the beatmap converter.	2017-04-18 11:13:11 +09:00
smoogipooo	4a60e9299e	Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion	2017-04-18 10:59:43 +09:00
Dean Herbert	8ef675d9b3	Add fallback to allow FilterCriteria to run without a ruleset being set.	2017-04-18 10:55:45 +09:00
Dean Herbert	5939ba9143	Fix ruleset not always being initialised correctly.	2017-04-18 10:55:33 +09:00
smoogipooo	5a78ce15a1	Fix CanConvert not returning correctly.	2017-04-18 10:23:49 +09:00
smoogipooo	d5c5b7eb6b	Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion	2017-04-18 10:09:36 +09:00
Dean Herbert	6b6690caf7	Fix filtering by ruleset.	2017-04-18 10:04:41 +09:00
Dean Herbert	f2174054ea	Fix song select.	2017-04-18 10:04:32 +09:00
smoogipooo	1be1683a4f	Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion	2017-04-18 09:58:39 +09:00
smoogipooo	0cef14ca63	CI fixes.	2017-04-18 09:51:02 +09:00
Dean Herbert	d3c1520a2d	Fix beatmaps not getting the correct ruleset on import.	2017-04-18 09:47:29 +09:00
Dean Herbert	2734983564	Add unique constraints on RulesetInfo table to ensure things stay sane.	2017-04-18 09:47:16 +09:00
smoogipooo	0e1ce333e3	Make IBeatmapProcessor a class with virtual methods.	2017-04-18 09:43:43 +09:00
smoogipooo	efc050a95a	Make IBeatmapConverter an abstract class instead of an interface.	2017-04-18 09:38:52 +09:00
smoogipooo	456aee63ca	Mode IBeatmapConverter and IBeatmapProcessor to osu.Game.Modes.Beatmaps namespace.	2017-04-18 09:36:08 +09:00
smoogipooo	c61e3265bb	A few xmldoc additions/fixes.	2017-04-18 09:20:38 +09:00
smoogipooo	786446354e	Fix post-rebase errors.	2017-04-18 09:00:53 +09:00
smoogipooo	04973ae65e	Fix conversion types for Catch and Mania.	2017-04-18 08:58:21 +09:00
smoogipooo	09208adf81	Re-implement legacy hit object conversion.	2017-04-18 08:58:21 +09:00
smoogipooo	2767fbd81a	Implement Beatmap conversion testing.	2017-04-18 08:57:09 +09:00
Dean Herbert	928550b1a8	Merge branch 'master' into remove-playmode	2017-04-17 21:01:10 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00
Huo Yaoyuan	c235a14e3e	Don't block input in BeatmapInfoWedge.	2017-04-17 17:08:01 +08:00
Dean Herbert	db6556a0f9	Index DeletePending for better performance.	2017-04-17 17:44:02 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
Dean Herbert	83b083ce64	Move SQLite connections out of database classes; make abstract Database.	2017-04-17 14:37:52 +09:00
Dean Herbert	ce12cc20bd	Merge remote-tracking branch 'upstream/master' into remove-playmode	2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger	60f7879875	Explicitly set C# 6.0 for now.	2017-04-16 06:44:08 +09:00
smoogipooo	ddce3c157f	Clean up a few remaining stragglers.	2017-04-15 06:15:55 +09:00
smoogipooo	4a149c4ab8	Better default values + don't set Mode from outside.	2017-04-15 06:14:31 +09:00
smoogipooo	0333e1a050	Remove unused usings.	2017-04-15 05:57:18 +09:00
smoogipooo	3845ab2a72	Add comment.	2017-04-15 05:55:38 +09:00
smoogipooo	6dbc75283c	Re-implement config value.	2017-04-15 05:52:58 +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
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Dan Balasescu	31ce66bfdc	Trim whitespace.	2017-04-15 01:31:42 +09:00
Dan Balasescu	3de3b94978	Merge branch 'master' into song-progress-graph	2017-04-15 01:29:02 +09:00
Dean Herbert	52ddc414d5	Fix errors.	2017-04-14 20:17:17 +09:00
Dean Herbert	ed3956eca5	Make comma separators optional.	2017-04-14 20:09:01 +09:00
Dean Herbert	ac3b435f00	Merge remote-tracking branch 'upstream/master' into hud-improvements ... # Conflicts: # osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs	2017-04-14 19:29:59 +09:00