Commit Graph

1838 Commits

Author SHA1 Message Date
6be80c95ae Preload song select from main menu. 2017-03-17 20:11:59 +09:00
c7fa79b027 Fix nullref. 2017-03-17 20:09:23 +09:00
907236e475 Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00
4b97304603 CarouselContainer -> BeatmapCarousel. 2017-03-17 19:12:54 +09:00
dc28f8c79e Remove all external access to BeatmapGroup. 2017-03-17 19:12:15 +09:00
3401759665 Don't batch imports for now. 2017-03-17 18:57:24 +09:00
ba73968303 Load whole panel background in async. 2017-03-17 18:28:21 +09:00
2abcdbf4df Fix potentially incorrect states being applied to panels on first display. 2017-03-17 14:56:12 +09:00
cd98af29c4 Only calculate difficulties on import for now. 2017-03-17 11:53:13 +09:00
9c664e5b05 Reorganise song select methods to allow for more flexibility. 2017-03-17 11:52:54 +09:00
ea642e5ef4 Merge branch 'master' into scoreprocessor_failing_improvements 2017-03-17 00:52:30 +09:00
e78bcf8739 Update TabControl in line with framework changes. 2017-03-17 00:39:40 +09:00
b13340c3c8 Move CheckFailed outside of Schedule(). 2017-03-17 00:30:23 +09:00
e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
28e006eeb9 Move MapDifficultyRange into BaseDifficulty. 2017-03-16 23:17:27 +09:00
60fc782e93 Merge branch 'master' into beatmap_timinginfo 2017-03-16 23:08:24 +09:00
271dddc9a7 Merge branch 'master' into generic_scoreprocessor 2017-03-16 23:04:19 +09:00
8cd1353d74 Fix serious input regression. 2017-03-16 22:09:35 +09:00
2cf6ed423e Disallow duplicate active changes. 2017-03-16 21:33:08 +09:00
84b080a060 Make transition logic a bit more sane. 2017-03-16 21:26:03 +09:00
110bdbd0c1 Make everything share DropDown implementations again. Remove unnecessary files. 2017-03-16 21:17:14 +09:00
ab8a5afdb9 AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09:00
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
e17f728282 Fix CI. 2017-03-16 17:04:03 +09:00
93c0fe5140 Remove unnecessary set. 2017-03-16 17:02:37 +09:00
1a7c2eda5e Size FilterControl relatively now that we can. 2017-03-16 17:01:02 +09:00
1156e76c28 Don't directly access Header. 2017-03-16 17:00:49 +09:00
bd5493fb25 Add back correct defaults. 2017-03-16 16:44:14 +09:00
334e389518 Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
4bedd4d2d7 Block input behind FilterControl. 2017-03-16 14:33:31 +09:00
da6b98db10 fixup! Filter doesn't need to be public, nor have a property. 2017-03-16 14:23:48 +09:00
269c1a5e5c Reword some comments. 2017-03-16 14:08:37 +09:00
352de22590 Filter doesn't need to be public, nor have a property. 2017-03-16 14:08:29 +09:00
4d84bf7350 Change difficulty sort to be based on MaxStarDifficulty. 2017-03-16 13:59:23 +09:00
7764474cfe Fix possible nullref. 2017-03-16 13:49:16 +09:00
2a2caeba32 Add better failing support to ScoreProcessor. 2017-03-16 13:39:57 +09:00
5cafec3b6a Add back CreateScoreProcessor to Ruleset to instantiate a non-generic ScoreProcessor for ScoreDatabase. 2017-03-16 13:13:45 +09:00
7b66faab9e Fix filename. 2017-03-16 12:59:09 +09:00
82033faaab Warning/error fixing. 2017-03-16 12:57:50 +09:00
c82ae011fb Make ScoreProcessors take generic judgements. 2017-03-16 12:45:23 +09:00
360340c61d Fix linter issues 2017-03-15 22:39:09 -04:00
01cca1a4d2 Refactor color handling
colour*
2017-03-15 20:52:31 -04:00
db5a1e241a Don't crash on unimplemented sorts 2017-03-15 20:18:20 -04:00
3aecbf5739 Rearrange things somewhat 2017-03-15 20:15:40 -04:00
cac6c42aac Merge remote-tracking branch 'upstream/master' into tab-control 2017-03-15 20:15:28 -04:00
418189effd Adjust/improve a few comments. 2017-03-15 21:58:00 +09:00
4de3dde44d Fix post-merge error. 2017-03-15 21:40:19 +09:00
42da0f1a72 Merge remote-tracking branch 'origin/master' into generic_judgements_2
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
	osu.Game/Modes/UI/HitRenderer.cs
	osu.Game/osu.Game.csproj
2017-03-15 21:36:43 +09:00
3a8d1d3619 Add license headers. 2017-03-15 21:32:47 +09:00
0f4df0566b HasSpecial -> HasHold. 2017-03-15 19:43:38 +09:00