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
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
Dean Herbert
21984ba764
Move DummyWorkingBeatmap to a more global level (OsuScreen)
2017-07-19 15:16:39 +09:00
Dean Herbert
df60fc0f0a
Stop playing previous beatmap even if new beatmap has no track
2017-07-19 15:16:36 +09:00
Dean Herbert
e47faf4e85
Add a dummy beatmap provider for use in BeatmapInfoWedge
2017-07-19 15:16:33 +09:00
Dean Herbert
c5d23daa6b
Merge remote-tracking branch 'upstream/master' into remove-dragbar
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-07-18 13:44:23 +09:00
Dean Herbert
b5035ec245
Merge branch 'master' into songselect-preview-fix
2017-07-18 13:05:03 +09:00
Dan Balasescu
c13dc943f8
Merge branch 'master' into fix-track-rotation
2017-07-14 19:25:54 +10:00
Dan Balasescu
3914b3ba13
Merge branch 'master' into right-mouse-scrollbar
2017-07-14 19:15:00 +10:00
Dean Herbert
95a40e39ec
Merge branch 'master' into mods_overlay_fix
2017-07-14 17:31:52 +09:00
Dean Herbert
3aeed86392
Merge branch 'master' into drawable-room-update
2017-07-14 15:29:27 +09:00
Dean Herbert
6c9219856d
Add comment
2017-07-14 09:39:40 +09:00
Nabile Rahmani
840cc918ea
Use Enabled instead of a private field.
2017-07-13 23:35:19 +02:00
Dean Herbert
ce204b8e7b
Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar
2017-07-14 06:23:07 +09:00
Nabile Rahmani
8014cd55a2
Make the skip button clickable only once.
2017-07-13 21:59:17 +02:00
Dean Herbert
de46f3ab07
Remove all unnecessary parenthesis where object initialisers are used
...
Enforces at CI.
2017-07-13 15:11:33 +09:00
DrabWeb
b196b1d3c6
CI fixes, switch RoomInspector to use BeatmapSetCover.
2017-07-13 01:24:59 -03:00
DrabWeb
fea40ccc1a
Share BeatmapSet cover sprite code.
2017-07-13 01:17:47 -03:00
DrabWeb
0624f578eb
Update with online beatmap changes.
2017-07-13 01:06:46 -03:00
DrabWeb
dc5ec319a2
Merge https://github.com/ppy/osu into drawable-room-update
2017-07-13 01:00:32 -03:00
Dean Herbert
2c1f3de47a
Rename 2X resources to be defaults
2017-07-13 10:27:39 +09:00
Dean Herbert
56c817e4b6
Merge branch 'master' into osu-direct-search
2017-07-13 10:16:27 +09:00
Dean Herbert
9d47dd9ff9
Add support for right mouse absolute scrolling (when enabled)
...
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
EVAST9919
0b1db1502d
removed useless bool
2017-07-12 09:42:38 +03:00
EVAST9919
ab8fb2edab
Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix
2017-07-12 09:31:56 +03:00
Dean Herbert
04e99d1369
Only apply disable rules when in a screen stack.
2017-07-12 13:40:17 +09:00
Dean Herbert
54f6befd67
Merge branch 'master' into fix-track-rotation
2017-07-12 13:18:16 +09:00
Dean Herbert
0322e66c25
Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist
2017-07-12 13:07:23 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Seth
b30721edbe
Merge branch 'master' into drawable-room-update
2017-07-11 20:42:44 -03:00
Thomas Müller
4045083dcd
Update sorting comparers in line with framework changes
2017-07-11 21:21:58 +03:00
