3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
4f10256182
Remove unnecessary count check
2017-07-20 15:34:44 +09:00
61c665f239
Add required null check
2017-07-20 15:16:07 +09:00
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
c130981184
Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
2017-07-20 14:06:09 +09:00
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
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
8417e59de3
Merge pull request #1029 from smoogipooo/fix-beatmap-null
...
Fix Player crashing due to null BeatmapInfo (now unused).
2017-07-20 09:40:18 +09:00
b00fc857dd
Merge branch 'master' into fix-beatmap-null
2017-07-20 09:33:14 +09:00
8d727b898f
Don't rely on BeatmapSetInfo being present
2017-07-20 09:23:11 +09:00
d69470f2ae
Fix TestWorkingBeatmap broken by attempting to load storyboard
2017-07-20 09:22:39 +09:00
a3329fef37
Merge pull request #937 from MrTheMake/intro-track-start-fix
...
Don't start a beatmap's track until the intro is done playing
2017-07-20 09:05:15 +09:00
fd518e2294
Don't start a beatmap's track until the intro is done playing
2017-07-20 01:57:46 +02:00
bac8693c81
Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes
2017-07-20 01:08:42 +02:00
e0fb2563b5
remove using
2017-07-20 01:08:26 +02:00
c2a2f77210
Merge branch 'master' into user-profile-fixes
2017-07-20 01:06:36 +02:00
b016103894
add link to user page
2017-07-20 01:03:00 +02:00
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
d75e439f94
Fix Player crashing due to null BeatmapInfo (now unused).
2017-07-20 01:27:27 +09:30
6ff2b73c30
Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange
2017-07-19 16:50:29 +02:00
a7d4a3d473
Merge pull request #1027 from peppy/non-null-beatmap
...
Make Beatmap non-nullable
2017-07-19 22:05:24 +09:30
38431f8555
Fix remaining test case issues
2017-07-19 19:10:04 +09:00
8ce71ef235
Fix broken test case
2017-07-19 18:48:27 +09:00
da92fccdb0
Merge branch 'master' into non-null-beatmap
2017-07-19 18:32:42 +09:00
d7dddec328
Set zero-difficulty values local to the dummy beatmap
2017-07-19 18:32:11 +09:00
8764d88f0f
Update framework
2017-07-19 18:24:03 +09:00
2c5019ff7c
Forward action in saner way
2017-07-19 18:22:46 +09:00
b6b7ae47db
Merge branch 'master' into user-profile-fixes
2017-07-19 18:15:38 +09:00
0b53f1a7e3
Reference system
2017-07-19 18:09:59 +09:00
a01209cfe0
Simplify comparator
2017-07-19 18:09:59 +09:00
35157ca6b8
Make DefaultBeatmap private get.
2017-07-19 18:09:59 +09:00
2eccb3822a
Make link text not suck
2017-07-19 17:54:04 +09:00
285790bae0
Merge pull request #1026 from peppy/beatmap-delete-fixes
...
Fix crashes related to deleting/importing beatmaps
2017-07-19 17:46:49 +09:30
42af26a5a5
Merge branch 'master' into beatmap-delete-fixes
2017-07-19 17:34:12 +09:30
11eecdd281
Merge pull request #1028 from peppy/fix-flashy-sides
...
Fix main menu flashy sides moving too much
2017-07-19 17:26:26 +09:30
c34856922c
Gratify CI
2017-07-19 16:34:18 +09:00
2a2f4e2a8b
Ensure side flashes are not visible during moving transitions
2017-07-19 16:13:01 +09:00
2b1e19814c
Side flashes should not be affected by parallax
2017-07-19 16:07:11 +09:00
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
64ebc01a3b
Remove many now unnecessary null-checks
2017-07-19 15:45:23 +09:00
21d07428fe
Fix some test regressions
2017-07-19 15:16:59 +09:00
8e8767cd37
Give song select a better default background whecn the beatmap's can't be loaded
2017-07-19 15:16:55 +09:00
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
0846414c5b
Simplify state changes
2017-07-19 15:16:51 +09:00
632d2e8ba5
Dummy beatmap has dummy ruleset
2017-07-19 15:16:48 +09:00
f168ee660c
Move dummy to BeatmapDatabase
2017-07-19 15:16:43 +09:00
3289d93f22
Give the dummy beatmap a background
2017-07-19 15:16:42 +09:00
007b343854
Fix incorrect equality check when TimingPointAt returns a default T
2017-07-19 15:16:40 +09:00
21984ba764
Move DummyWorkingBeatmap to a more global level (OsuScreen)
2017-07-19 15:16:39 +09:00
