Commit Graph

1354 Commits

Author SHA1 Message Date
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
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
21984ba764 Move DummyWorkingBeatmap to a more global level (OsuScreen) 2017-07-19 15:16:39 +09:00
df60fc0f0a Stop playing previous beatmap even if new beatmap has no track 2017-07-19 15:16:36 +09:00
e47faf4e85 Add a dummy beatmap provider for use in BeatmapInfoWedge 2017-07-19 15:16:33 +09:00
c5d23daa6b Merge remote-tracking branch 'upstream/master' into remove-dragbar
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-07-18 13:44:23 +09:00
b5035ec245 Merge branch 'master' into songselect-preview-fix 2017-07-18 13:05:03 +09:00
c13dc943f8 Merge branch 'master' into fix-track-rotation 2017-07-14 19:25:54 +10:00
3914b3ba13 Merge branch 'master' into right-mouse-scrollbar 2017-07-14 19:15:00 +10:00
95a40e39ec Merge branch 'master' into mods_overlay_fix 2017-07-14 17:31:52 +09:00
3aeed86392 Merge branch 'master' into drawable-room-update 2017-07-14 15:29:27 +09:00
6c9219856d Add comment 2017-07-14 09:39:40 +09:00
840cc918ea Use Enabled instead of a private field. 2017-07-13 23:35:19 +02:00
ce204b8e7b Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar 2017-07-14 06:23:07 +09:00
8014cd55a2 Make the skip button clickable only once. 2017-07-13 21:59:17 +02:00
de46f3ab07 Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
2017-07-13 15:11:33 +09:00
b196b1d3c6 CI fixes, switch RoomInspector to use BeatmapSetCover. 2017-07-13 01:24:59 -03:00
fea40ccc1a Share BeatmapSet cover sprite code. 2017-07-13 01:17:47 -03:00
0624f578eb Update with online beatmap changes. 2017-07-13 01:06:46 -03:00
dc5ec319a2 Merge https://github.com/ppy/osu into drawable-room-update 2017-07-13 01:00:32 -03:00
2c1f3de47a Rename 2X resources to be defaults 2017-07-13 10:27:39 +09:00
56c817e4b6 Merge branch 'master' into osu-direct-search 2017-07-13 10:16:27 +09:00
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
0b1db1502d removed useless bool 2017-07-12 09:42:38 +03:00
ab8fb2edab Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix 2017-07-12 09:31:56 +03:00
04e99d1369 Only apply disable rules when in a screen stack. 2017-07-12 13:40:17 +09:00
54f6befd67 Merge branch 'master' into fix-track-rotation 2017-07-12 13:18:16 +09:00
0322e66c25 Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist 2017-07-12 13:07:23 +09:00
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
b30721edbe Merge branch 'master' into drawable-room-update 2017-07-11 20:42:44 -03:00
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
9bbcc0526d Disable beatmap changes in specified screens 2017-07-11 18:39:10 +09:00
b448603d6c CI fixes. 2017-07-11 01:42:51 -03:00
a9c50786b2 Fix osu! logo on main menu ending up in the wrong place
Also switch to using BeginDelayedSequence where possible.
2017-07-11 13:27:45 +09:00
c449491c04 Fix RoomInspector covers. 2017-07-11 01:18:16 -03:00
84701846ec Merge https://github.com/ppy/osu into osu-direct-search 2017-07-11 00:26:49 -03:00
c4e378571b Update framework 2017-07-10 11:54:23 +03:00
0e0c32008b More changes 2017-07-10 15:40:40 +09:00
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +09:00
33206fcf0e Use Hide instead of FadeTo(0) 2017-07-08 12:34:24 +03:00
adb88a8d49 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix 2017-07-08 12:28:41 +03:00
178685292a Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode 2017-07-08 12:25:08 +03:00
3c425dd07f Fix CI issue 2017-07-08 18:06:59 +09:00