Commit Graph

817 Commits

Author SHA1 Message Date
fa800f0977 fix storyboard path 2018-01-23 18:18:54 +08:00
a931d6e381 Merge branch 'master' into fix-user-download-cancel 2018-01-22 16:27:26 +09:00
53e40a77dc Don't show error messages when a download is user-cancelled
Resolves #1941.
2018-01-22 13:25:49 +09:00
88beee2d1f Keep downloads active until their associated import operation finishes
This avoids race conditions where a second download can potentially be started while the first is still active.
2018-01-22 13:20:04 +09:00
d8275c4f9b Fix beatmap query not including beatmap files 2018-01-16 18:20:46 +09:00
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
86581b6451 Remove extra braces 2018-01-11 17:02:09 +09:00
4fa038aa27 if not storyboard file 2018-01-11 13:53:41 +08:00
fbffc8bb89 fix load storyboard in osu file 2018-01-10 18:55:04 +08:00
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
4c0259a040 Merge branch 'master' into fix-storyboard-variables 2018-01-09 11:50:03 +09:00
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
01038bd9bb Merge branch 'master' into mania-rc-cleanup 2018-01-05 10:18:15 +09:00
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
0158246ba1 AppVeyor 2018-01-04 19:23:00 +08:00
dcc4e863ab move variables to StoryboardDecoder 2018-01-04 19:04:52 +08:00
89fe567496 use FileSafety.PathSanitise 2018-01-03 17:57:24 +08:00
bd171926d6 Remove AvailableColumns from ManiaRulesetContainer
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
7ba59d9d56 Merge branch 'master' into fix-import-context-state 2018-01-03 14:21:04 +09:00
7154efa1c6 Refresh import context on import error 2018-01-02 12:31:21 +09:00
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
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