Commit Graph

951 Commits

Author SHA1 Message Date
ddee9e992a Merge remote-tracking branch 'origin/master' into proper-taiko-hitsounds 2017-12-27 13:04:10 +09:00
b95d7fc2cd Revert "Make ControlPointInfo return a set default control point"
This reverts commit 3113a55a98.
2017-12-27 12:41:59 +09:00
3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
d479955e20 Fix spelling error 2017-12-26 20:01:02 +09:00
3113a55a98 Make ControlPointInfo return a set default control point 2017-12-26 19:33:01 +09:00
836d807f4f Give SampleControlPoint a 100% volume by default 2017-12-26 19:32:20 +09:00
3c8d30f8e6 Add a dialog offering to import beatmaps from stable 2017-12-26 00:52:11 +09:00
9ca03c0209 Simplify and tidy sample retrieval
Less static weirdness
2017-12-23 16:46:02 +09:00
5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
ed827d5424 more visual tests for BeatmapInfoWedge
also fix Author showing when not wanted
2017-12-22 12:33:52 +01:00
a3d947301b Merge branch 'master' into beatmap-serialization 2017-12-22 07:38:05 +09:00
620e9737c3 Avoid many many unnecessary enumerations 2017-12-21 22:33:16 +09:00
866d1c6e0f Remove now unused references 2017-12-21 22:13:18 +09:00
e4ead36544 Added completion text 2017-12-21 13:01:14 +01:00
cbc1aacf5c Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-21 13:00:11 +01:00
b2c0b013aa Remove migration setting in favour of export option in the editor 2017-12-21 19:56:12 +09:00
a3fcc0b60c Back to using SortedLists 2017-12-21 19:40:41 +09:00
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
58859f2ffb Rework registration/instantiation of decoders to not rely on reflection 2017-12-21 15:34:00 +09:00
22f8853f49 Serialize star difficulty for now 2017-12-21 14:44:51 +09:00
e8e5e8270b Rename decoder 2017-12-21 14:19:37 +09:00
bfa4f1a2c3 Apply changes in line with master changes 2017-12-21 13:59:03 +09:00
c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +09:00
3644eda9a9 Changed notification from "installed" to "imported" on beatmap download 2017-12-19 11:34:23 +01:00
ba614883ea used Any() instead of manually checking count == 0 (CI) 2017-12-18 11:16:57 +01:00
f898481523 Changed existing implementations to have a custom CompletionText 2017-12-18 11:14:07 +01:00
d2b80fdbfc Moved "undelete all" logic to BeatmapManager and added a progress notification 2017-12-18 10:55:07 +01:00
4c45102d61 Merge branch 'master' into undelete-button-add 2017-12-18 16:28:32 +09:00
49ce42d90c Add ToString() overrides on many classes to make debugging easier 2017-12-16 16:14:01 +09:00
1146ba02d7 Make GetWorkingBeatmap return a sane default rather than exception on lookup failure 2017-12-15 14:36:51 +09:00
78dd975a35 Initial carousel infrastructue changes 2017-12-15 14:36:51 +09:00
69653c7f4f Don't use nested ternary if 2017-12-12 13:07:34 +09:00
8dea999908 Order difficulty icons by ruleset 2017-12-11 21:35:47 +09:00
b10240d7ef Handle the case where the selected panel is no longer a valid selection better 2017-12-11 21:31:26 +09:00
970e55fc4a Update difficulty icons on headers to match filtered difficulties 2017-12-11 20:49:27 +09:00
f58c554d19 Add per-difficulty filtering support
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
3880c7157b Merge branch 'master' into fix-missing-metadata 2017-12-11 16:04:08 +09:00
08727266e7 Merge branch 'master' into add-ruleset-shortname 2017-12-11 15:41:11 +09:00
9069f1ccba Merge branch 'master' into most-played-beatmaps-section 2017-12-11 12:12:23 +09:00
8cbd6f32cb Moved menu music hash property back to intro and changed check (before undeleting) to "Protected" field. 2017-12-10 11:31:37 +01:00
1691a74b14 Merge branch 'undelete-button-add' of https://github.com/freezylemon/osu into undelete-button-add 2017-12-10 11:26:31 +01:00
e1c04a1f44 Added check for "menu music beatmap hash" before undeleting so circles.osu doesn't get imported on Undelete. Also moved the const property to BeatmapManager. 2017-12-08 12:50:04 +01:00
679134c030 Add ShortName to rulesets 2017-12-08 18:55:25 +09:00
d93a1fdaae Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-08 10:30:42 +01:00
31884a951a Remove "redundant" parenthesis 2017-12-08 15:53:59 +09:00
2e1dfa16a2 Fix checks disallowing import of older beatmaps with no embedded online IDs 2017-12-08 14:59:32 +09:00
95955d68ef rephrased description of local context checking 2017-12-07 14:14:50 +01:00
1dcbfab18e removed redundant comment 2017-12-07 13:56:37 +01:00
76c09ae59e added comments for local context checking 2017-12-07 13:44:47 +01:00
f2eef6621a Merge branch 'master' into fix-missing-metadata 2017-12-07 19:23:51 +09:00