Thomas Müller
9dc3987834
Merge pull request #1033 from peppy/fix-working-beatmap-double-load
...
Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
2017-07-20 20:53:53 +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
Dean Herbert
8bc2df8749
Merge pull request #1022 from jorolf/user-profile-fixes
...
User profile improvements
2017-07-20 19:40:26 +09:00
Dean Herbert
b25188895b
Update framework
2017-07-20 19:32:17 +09:00
Dean Herbert
cb3402098a
Merge remote-tracking branch 'upstream/master' into user-profile-fixes
2017-07-20 19:32:00 +09:00
Dean Herbert
bb167a9f82
Merge pull request #1037 from peppy/no-set-exclusive
...
Remove usage of SetExclusive
2017-07-20 19:29:28 +09:00
Dean Herbert
781d76d094
Merge remote-tracking branch 'upstream/master' into user-profile-fixes
2017-07-20 19:15:21 +09:00
Thomas Müller
8108f3e78d
Merge branch 'master' into no-set-exclusive
2017-07-20 12:11:32 +02:00
Thomas Müller
a104754e64
Merge pull request #1038 from peppy/fix-songselect-footer-light
...
Fix footer button light fading incorrectly
2017-07-20 12:10:38 +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
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
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
Dean Herbert
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
MrTheMake
fd518e2294
Don't start a beatmap's track until the intro is done playing
2017-07-20 01:57:46 +02:00
Jorolf
bac8693c81
Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes
2017-07-20 01:08:42 +02:00
Jorolf
e0fb2563b5
remove using
2017-07-20 01:08:26 +02:00
jorolf
c2a2f77210
Merge branch 'master' into user-profile-fixes
2017-07-20 01:06:36 +02:00
Jorolf
b016103894
add link to user page
2017-07-20 01:03:00 +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
Dan Balasescu
a7d4a3d473
Merge pull request #1027 from peppy/non-null-beatmap
...
Make Beatmap non-nullable
2017-07-19 22:05:24 +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
d7dddec328
Set zero-difficulty values local to the dummy beatmap
2017-07-19 18:32:11 +09:00
Dean Herbert
8764d88f0f
Update framework
2017-07-19 18:24:03 +09:00
Dean Herbert
2c5019ff7c
Forward action in saner way
2017-07-19 18:22:46 +09:00
Dean Herbert
b6b7ae47db
Merge branch 'master' into user-profile-fixes
2017-07-19 18:15:38 +09:00
Dean Herbert
0b53f1a7e3
Reference system
2017-07-19 18:09:59 +09:00
Dean Herbert
a01209cfe0
Simplify comparator
2017-07-19 18:09:59 +09:00
Dean Herbert
35157ca6b8
Make DefaultBeatmap private get.
2017-07-19 18:09:59 +09:00
Dean Herbert
2eccb3822a
Make link text not suck
2017-07-19 17:54:04 +09:00
Dan Balasescu
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
Dan Balasescu
42af26a5a5
Merge branch 'master' into beatmap-delete-fixes
2017-07-19 17:34:12 +09:30
Dan Balasescu
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
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
