3819 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ocboogie	c0f4cbcba6	Added back PlayerLoader overlays	2017-04-17 23:36:11 -07: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
ocboogie	be8d32688b	Fixed HotkeyRetryOverlay just going to a black screen	2017-04-17 22:36:03 -07: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
ocboogie	5c48fa6cb1	Removed testing line	2017-04-17 21:35:48 -07:00
ocboogie	aa466d0e84	PlayerLoader creates a new instance of the Player class on Restart	2017-04-17 21:32:38 -07:00
Dean Herbert	2df21066e7	Add constant for osu! playfield size.	2017-04-18 12:19:39 +09:00
smoogipooo	ef5d50e7d8	mode -> ruleset.	2017-04-18 11:29:27 +09:00
Dan Balasescu	f744b48399	Merge branch 'master' into better-conversion	2017-04-18 11:26:33 +09:00
Dan Balasescu	1df3189e5d	Merge pull request #640 from smoogipooo/remove-playmode ... Remove PlayMode enum and make Rulesets modular	2017-04-18 11:21:02 +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
Dean Herbert	7d3a1c5658	Remove using.	2017-04-18 10:59:50 +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	3b9067e55e	Convert chords to strong hits for osu!mania conversion.	2017-04-18 10:41:49 +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
Dean Herbert	4393c2cb25	Add unit tests to ensure all rulesets' beatmaps are added successfully.	2017-04-18 09:46:14 +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
Jorolf	095b6fded6	removed unused stuff and change the tooltip y coordinate	2017-04-17 19:50:34 +02:00
Jorolf	906d68936a	Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips	2017-04-17 17:43:54 +02:00
Jorolf	25fd1d2b72	made method into property	2017-04-17 17:43:44 +02:00
Jorolf	d4ac3c5e9c	Update MenuCursor.cs	2017-04-17 17:10:55 +02:00
Jorolf	5d828a20e0	some formatting	2017-04-17 17:09:17 +02:00
Jorolf	773e6a2911	moved tooltip stuff to Tooltip instead of MenuCursor	2017-04-17 17:04:48 +02:00
Jorolf	dd26f9fcac	Merge branch 'master' of git://github.com/ppy/osu into tooltips	2017-04-17 14:45:46 +02:00
Dean Herbert	928550b1a8	Merge branch 'master' into remove-playmode	2017-04-17 21:01:10 +09:00
Dean Herbert	4b6ba565f8	Fix forgotten revert.	2017-04-17 20:10:51 +09:00
smoogipooo	eaa171baf4	Rewrite bar lines to make sure they're centered at their beat's start position.	2017-04-17 20:02:36 +09:00
Dean Herbert	3c00776416	Merge pull request #639 from huoyaoyuan/fixes ... Don't block input in BeatmapInfoWedge.	2017-04-17 19:54:06 +09:00
Dean Herbert	fe0d18777e	Fix appveyor issues.	2017-04-17 19:52:07 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00