Commit Graph

4017 Commits

Author SHA1 Message Date
2eccb3822a Make link text not suck 2017-07-19 17:54:04 +09:00
42af26a5a5 Merge branch 'master' into beatmap-delete-fixes 2017-07-19 17:34:12 +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
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
6016310b09 Use a better default for difficulty values 2017-07-19 15:16:37 +09:00
df60fc0f0a Stop playing previous beatmap even if new beatmap has no track 2017-07-19 15:16:36 +09:00
59416584c1 Don't show theme song in playlist 2017-07-19 15:16:35 +09:00
e47faf4e85 Add a dummy beatmap provider for use in BeatmapInfoWedge 2017-07-19 15:16:33 +09:00
6f59e5feec Add null check on stream 2017-07-19 14:56:27 +09:00
f00140f0a4 Avoid crashes on attempting to import the same path twice in quick succession 2017-07-19 14:56:24 +09:00
5761eb30a0 Fix nullref error on re-importing a DeletePending beatmap
Callback was expecting the beatmap to be populated where it wasn't being.
2017-07-19 14:56:20 +09:00
3ba119c115 Ensure toolbar disappears when osu logo transition is cancelled 2017-07-18 17:09:53 +03:00
b40c897dbd Fix osu logo shockwave playing when transition is aborted
This is a very nice use-case scenario for TransformSequence.OnComplete
2017-07-18 15:28:56 +03:00
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
6d8bdadf2d Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours 2017-07-18 12:35:48 +03:00
a225b542d5 Sender is always non-null 2017-07-18 12:35:36 +03:00
fce5a191f1 Migrate padding into the scroll content to not cut off effects 2017-07-18 12:26:27 +03:00
e58ea97604 Improve design as requested 2017-07-18 12:26:05 +03:00
7acff29bd3 Fix OsuTooltipContainer.PopIn not overriding PopOut transforms 2017-07-18 11:53:56 +03:00
c8eeea64c3 Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours 2017-07-18 10:54:15 +03:00
e72c009dd7 Highlight custom-named users 2017-07-18 10:53:41 +03:00
4b4b03756a Don't use dodgy OnLoaded "event" 2017-07-18 15:37:58 +09:00
82217be988 Fix dodgy event clearing
Also use local ariables where possible.
2017-07-18 15:24:52 +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
4229f933fe Rename link class, add hover colour 2017-07-18 10:51:11 +09:00
ae58e18178 Reorder code based on depth (and avoid possible conflicts) 2017-07-18 10:41:52 +09:00
9c70d03a33 replace SpriteText with OsuSpriteText 2017-07-17 21:12:50 +02:00
80dc888769 address CI concerns 2017-07-17 21:11:54 +02:00
edd4e622cf add hyper links to twitter, website and skype 2017-07-17 20:31:10 +02:00
b9eb7a8445 make chat message users open UserProfileOverlay 2017-07-17 20:26:55 +02:00
689866f5dd minor improvements 2017-07-17 20:25:57 +02:00
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
93290ef966 Rename populate method 2017-07-17 13:56:50 +09:00
a63124c935 User property instead of weirdly named method 2017-07-17 13:39:29 +09:00
f322c264a0 One constant per line 2017-07-17 13:24:05 +09:00
5d77a5f988 Allow closing profile by clicking basically anywhere 2017-07-17 10:15:55 +09:00
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00