Thomas Müller
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
Thomas Müller
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
9a33e77d63
Merge branch 'master' into fix-carousel-debounce-race
2017-07-21 17:44:04 +09:00
Thomas Müller
3a086534f8
Merge branch 'master' into fix-selection-changing
2017-07-21 10:22:11 +02:00
Dean Herbert
12b6b80d5c
Make method to flush filter requests
2017-07-21 17:20:52 +09:00
Dean Herbert
bf254bf5cf
Merge branch 'master' into fix-songprogress-endtime
2017-07-21 16:46:41 +09:00
Dean Herbert
6bdf6bb675
Merge branch 'master' into previewtime-seeking
2017-07-21 15:06:18 +09:00
Dean Herbert
f7b64a458a
Fix incorrect end time calculation in SongProgressGraph
2017-07-21 10:10:25 +09:00
Dean Herbert
b4dddc98ee
Fix selection changing on entering song select
...
Conditional was backwards, easy fix.
2017-07-21 06:15:44 +09:00
Dean Herbert
fb2f1224b3
Fix carousel filter debounce causing a race condition
...
Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.
2017-07-21 05:58:58 +09:00
Thomas Müller
e84d8cc020
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:15:58 +02:00
Thomas Müller
4e33efd41f
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:04:45 +02:00
Thomas Müller
518a7c460e
Merge branch 'master' into fix-beatmap-select-race
2017-07-20 21:04:40 +02:00
Thomas Müller
ed6478be8b
Merge branch 'master' into always-load-storyboard
2017-07-20 20:54:16 +02:00
Thomas Müller
e21822cdeb
Merge branch 'master' into fix-working-beatmap-double-load
2017-07-20 20:35:31 +02:00
Thomas Müller
01ff7e8f4b
Merge branch 'master' into fix-empty-carousel
2017-07-20 20:31:06 +02:00
MrTheMake
22f3e97241
Small optimization to the main menu intro seeking.
2017-07-20 17:15:39 +02:00
Thomas Müller
8108f3e78d
Merge branch 'master' into no-set-exclusive
2017-07-20 12:11:32 +02:00
Dean Herbert
6e0b7b81f8
Switch to correct ruleset when changing beatmap
...
This is only really noticeable when using the MusicController to change tracks while at song select.
2017-07-20 19:10:20 +09:00
Dean Herbert
577740d329
Fix footer button light fading incorrectly
...
Logic was reliant on HoverLost coming before Hover events, which has since changed. Was also able to tidy this code up a bit in the process.
2017-07-20 18:08:51 +09:00
Dean Herbert
3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Dean Herbert
4f10256182
Remove unnecessary count check
2017-07-20 15:34:44 +09:00
Dean Herbert
61c665f239
Add required null check
2017-07-20 15:16:07 +09:00
Dean Herbert
a59557f039
Fix selection not being reset correct when changing between rulesets
...
Carousels filtered to results with no maps visible were not being handled correctly in a few different ways. This covers all those scenarios.
2017-07-20 15:12:20 +09:00
Dean Herbert
c130981184
Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
2017-07-20 14:06:09 +09:00
Dean Herbert
15eb6954da
Fix hitting down and enter at song select causing a hard-crash
...
Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.
2017-07-20 11:50:52 +09:00
Dean Herbert
d6968ca09c
Remove FullyLoaded logic
...
Always parse storyboards for now.
Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.
2017-07-20 11:01:50 +09:00
Dean Herbert
b00fc857dd
Merge branch 'master' into fix-beatmap-null
2017-07-20 09:33:14 +09:00
Dean Herbert
8d727b898f
Don't rely on BeatmapSetInfo being present
2017-07-20 09:23:11 +09:00
Dean Herbert
d69470f2ae
Fix TestWorkingBeatmap broken by attempting to load storyboard
2017-07-20 09:22:39 +09:00
MrTheMake
fd518e2294
Don't start a beatmap's track until the intro is done playing
2017-07-20 01:57:46 +02:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
smoogipooo
d75e439f94
Fix Player crashing due to null BeatmapInfo (now unused).
2017-07-20 01:27:27 +09:30
Dean Herbert
38431f8555
Fix remaining test case issues
2017-07-19 19:10:04 +09:00
Dean Herbert
8ce71ef235
Fix broken test case
2017-07-19 18:48:27 +09:00
Dean Herbert
da92fccdb0
Merge branch 'master' into non-null-beatmap
2017-07-19 18:32:42 +09:00
Dean Herbert
35157ca6b8
Make DefaultBeatmap private get.
2017-07-19 18:09:59 +09:00
Dean Herbert
c34856922c
Gratify CI
2017-07-19 16:34:18 +09:00
Dean Herbert
2a2f4e2a8b
Ensure side flashes are not visible during moving transitions
2017-07-19 16:13:01 +09:00
Dean Herbert
2b1e19814c
Side flashes should not be affected by parallax
2017-07-19 16:07:11 +09:00
Dean Herbert
c8593a38c8
Remove incorrect looping reset behaviour
...
Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.
2017-07-19 15:55:16 +09:00
Dean Herbert
64ebc01a3b
Remove many now unnecessary null-checks
2017-07-19 15:45:23 +09:00
Dean Herbert
8e8767cd37
Give song select a better default background whecn the beatmap's can't be loaded
2017-07-19 15:16:55 +09:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Dean Herbert
0846414c5b
Simplify state changes
2017-07-19 15:16:51 +09:00
Dean Herbert
632d2e8ba5
Dummy beatmap has dummy ruleset
2017-07-19 15:16:48 +09:00
Dean Herbert
f168ee660c
Move dummy to BeatmapDatabase
2017-07-19 15:16:43 +09:00
Dean Herbert
3289d93f22
Give the dummy beatmap a background
2017-07-19 15:16:42 +09:00
