Commit Graph

5855 Commits

Author SHA1 Message Date
c1989dbafe Merge branch 'master' into direct-relevance-sorting 2017-12-08 22:15:57 +09:00
4160c10921 Merge branch 'master' into direct-relevance-sorting 2017-12-08 21:18:18 +09:00
40652d2e74 Merge branch 'master' into fix-importing-some-beatmaps 2017-12-08 21:18:01 +09:00
856b56d79c Fixed small typo. 2017-12-08 12:54:36 +01:00
51dc66df12 Add support for relevance based search results in osu!direct 2017-12-08 18:48:36 +09: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
9e37a122e1 Merge branch 'master' into fix-sensitivityslider 2017-12-07 21:01:53 +09:00
d52b84df46 Move KeyboardStep assignment to ctor 2017-12-07 20:53:28 +09:00
46cd6fdb45 Merge remote-tracking branch 'origin/master' into fix-sensitivityslider 2017-12-07 20:49:48 +09:00
24b3b10942 Move drawable assignment to load, remove depth overrides 2017-12-07 20:44:55 +09:00
8c89354b36 Remove extra whitespace 2017-12-07 20:44:38 +09:00
d36982b1d9 Merge branch 'master' into header-button-should-derive 2017-12-07 20:04:41 +09:00
c35c8263b9 Merge remote-tracking branch 'upstream/master' into input-revamp 2017-12-07 18:07:26 +09:00
2a1a9b9f1f Fix post-merge issue 2017-12-07 17:26:39 +09:00
44ee11e75f Merge branch 'master' into fix-beatmap-carousel-lag 2017-12-07 15:30:50 +09:00
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
9c4ca46786 Merge branch 'master' into shader-precompile 2017-12-07 04:15:24 +09:00
8e3cce798d Merge branch 'master' into fix-async-is-loaded 2017-12-06 23:01:38 +09:00
34596b3368 Rename and comment for clarification 2017-12-06 21:47:48 +09:00
04ae64e9fd Add missing IsCompleted check to ensureValid 2017-12-06 16:20:49 +09:00
15ed3b4aac Fix IsValueCreated method not cecking whether the async task was completed
Caused potential stutters for components that relied on this check.
2017-12-06 09:49:12 +09:00
fb6408257a Add shader precompile step
Resolves  https://github.com/ppy/osu-framework/issues/1180 in a way.
2017-12-05 17:41:47 +09:00
c1b607fed9 Wait until track has restarted before continuing operation
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
caee6c1cf1 Use Restart instead of Start 2017-12-04 21:40:26 +09:00
a83add8540 Tidy up events 2017-12-04 20:30:56 +09:00
22656233d3 Merge branch 'master' into fix-playlist-audio-issue 2017-12-04 19:24:03 +09:00
d75db5046b Merge branch 'master' into editor-composer 2017-12-04 12:41:40 +09:00
5f9de399e4 Add keydown override 2017-12-04 11:30:25 +09:00
14096c90cc removed looping if only one song is in the list (temporarily)
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
9d13bf3602 remove redundant expression 2017-12-03 14:35:23 +01:00
dfa7448716 use ?: expression 2017-12-03 14:25:12 +01:00
0c9ebcd58c fix possible NullRef 2017-12-03 14:15:08 +01:00
a1dbd7916b fixes MusicController constantly trying to start a track
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
7957e55710 Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09:00
ad8cd7eb5d fix possible NullReference?
AppVeyor pls?
2017-12-02 17:04:42 +01:00
cc76c58f5f fall back to .osu file for storyboard if no .osb file is present
+ CI fixes
2017-12-02 16:05:39 +01:00
2852337b04 Remove unused using 2017-12-02 20:35:47 +09:00
cd20d6df16 Apply suggested changes 2017-12-02 20:31:15 +09:00
c14d68e685 Use OsuColour for radio buttons 2017-12-02 20:30:18 +09:00
a80059032c Remove PlayfieldOverlay 2017-12-02 20:24:10 +09:00
5a7c4772bd Remove PlayfieldUnderlay for now 2017-12-02 19:53:20 +09:00
e07b85311b removed unnecessary using 2017-12-01 22:15:10 +01:00
c466296b14 reverted split at Decoder, moved logic down
I'm done experimenting, sorry
- `Decoder` only returns a "Beatmap"`Decoder` now
- "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder`
- moved parse methods down in the hierarchy where I forgot to do that
- renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`
2017-12-01 22:05:01 +01:00
a49f3479a2 Split retrieving of beatmap and storyboard decoder
Storyboard works again. Not satisfied with the solution though.
2017-12-01 19:11:52 +01:00
de94082b1e Fix filename casing to compile on Linux 2017-12-01 18:10:39 +01:00
db50ad794e CI adjustments
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
806c0e3b26 restructured OsuLegacyDecoder into LegacyDecoder
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
70b29b8b62 Merge branch 'master' into fix-set-hidden-crash 2017-12-01 23:35:48 +09:00
7532795935 Lock during validity checks 2017-12-01 22:43:49 +09:00