Commit Graph

2437 Commits

Author SHA1 Message Date
edd71c0560 Tidy up and comment PlayerLoader logic. 2017-04-18 16:56:01 +09:00
2ccb8b154f Change conditional ordering to allow player to always run its fadeOut sequence. 2017-04-18 16:47:30 +09:00
24deaf05b6 Merge branch 'master' into player-loader-restart 2017-04-18 16:36:25 +09:00
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
fbd26a1d5e Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
1f7373db8f Removed unneeded restarting variable 2017-04-17 23:52:38 -07:00
2bd89e922f Removed unneeded newPlayer 2017-04-17 23:48:21 -07:00
c0f4cbcba6 Added back PlayerLoader overlays 2017-04-17 23:36:11 -07:00
727086c0b2 Updates in-line with framework. 2017-04-18 15:34:53 +09:00
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
cf404b4bcf We shouldn't be adding null hitobjects. 2017-04-18 14:46:56 +09:00
be8d32688b Fixed HotkeyRetryOverlay just going to a black screen 2017-04-17 22:36:03 -07:00
0dd97c433f Trim whitespace. 2017-04-18 14:34:39 +09:00
27ddf4b475 Refactor beatmap converters. 2017-04-18 14:31:06 +09:00
5c48fa6cb1 Removed testing line 2017-04-17 21:35:48 -07:00
aa466d0e84 PlayerLoader creates a new instance of the Player class on Restart 2017-04-17 21:32:38 -07:00
ef5d50e7d8 mode -> ruleset. 2017-04-18 11:29:27 +09:00
8844ff7ab7 CI fixes. 2017-04-18 11:20:39 +09:00
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
4a60e9299e Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 10:59:43 +09:00
8ef675d9b3 Add fallback to allow FilterCriteria to run without a ruleset being set. 2017-04-18 10:55:45 +09:00
5939ba9143 Fix ruleset not always being initialised correctly. 2017-04-18 10:55:33 +09:00
5a78ce15a1 Fix CanConvert not returning correctly. 2017-04-18 10:23:49 +09:00
d5c5b7eb6b Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 10:09:36 +09:00
6b6690caf7 Fix filtering by ruleset. 2017-04-18 10:04:41 +09:00
f2174054ea Fix song select. 2017-04-18 10:04:32 +09:00
1be1683a4f Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 09:58:39 +09:00
0cef14ca63 CI fixes. 2017-04-18 09:51:02 +09:00
d3c1520a2d Fix beatmaps not getting the correct ruleset on import. 2017-04-18 09:47:29 +09:00
2734983564 Add unique constraints on RulesetInfo table to ensure things stay sane. 2017-04-18 09:47:16 +09:00
0e1ce333e3 Make IBeatmapProcessor a class with virtual methods. 2017-04-18 09:43:43 +09:00
efc050a95a Make IBeatmapConverter an abstract class instead of an interface. 2017-04-18 09:38:52 +09:00
456aee63ca Mode IBeatmapConverter and IBeatmapProcessor to osu.Game.Modes.Beatmaps namespace. 2017-04-18 09:36:08 +09:00
c61e3265bb A few xmldoc additions/fixes. 2017-04-18 09:20:38 +09:00
786446354e Fix post-rebase errors. 2017-04-18 09:00:53 +09:00
04973ae65e Fix conversion types for Catch and Mania. 2017-04-18 08:58:21 +09:00
09208adf81 Re-implement legacy hit object conversion. 2017-04-18 08:58:21 +09:00
2767fbd81a Implement Beatmap conversion testing. 2017-04-18 08:57:09 +09:00
928550b1a8 Merge branch 'master' into remove-playmode 2017-04-17 21:01:10 +09:00
af13f97435 Fix regressions and test cases. 2017-04-17 19:44:03 +09:00
c235a14e3e Don't block input in BeatmapInfoWedge. 2017-04-17 17:08:01 +08:00
db6556a0f9 Index DeletePending for better performance. 2017-04-17 17:44:02 +09:00
a4e2f34ee7 Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
83b083ce64 Move SQLite connections out of database classes; make abstract Database. 2017-04-17 14:37:52 +09:00
ce12cc20bd Merge remote-tracking branch 'upstream/master' into remove-playmode 2017-04-17 13:00:53 +09:00
78273d76e3 Added basic loading screen and test case 2017-04-16 20:18:41 -07:00
60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +09:00
ddce3c157f Clean up a few remaining stragglers. 2017-04-15 06:15:55 +09:00
4a149c4ab8 Better default values + don't set Mode from outside. 2017-04-15 06:14:31 +09:00
0333e1a050 Remove unused usings. 2017-04-15 05:57:18 +09:00