Merge remote-tracking branch 'origin/master' into timingchange-rework

# Conflicts:
#	osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs

osu-framework

@@ -1 +1 @@
-Subproject commit 85700cfb1563d32a604001c86a9c7567954b4879
+Subproject commit c76d8b811b93d0c0862f342ebbab70a461006e13

osu.Desktop.VisualTests/Tests/TestCaseTooltip.cs

@@ -1,92 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Framework.Configuration;
-using OpenTK;
-using osu.Game.Graphics;
-
-namespace osu.Desktop.VisualTests.Tests
-{
-    internal class TestCaseTooltip : TestCase
-    {
-        public override string Description => "tests tooltips on various elements";
-
-        public override void Reset()
-        {
-            base.Reset();
-            OsuSliderBar<int> slider;
-            OsuSliderBar<double> sliderDouble;
-
-            const float width = 400;
-
-            Children = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 10),
-                    Children = new Drawable[]
-                    {
-                        new TooltipTextContainer("text with a tooltip"),
-                        new TooltipTextContainer("more text with another tooltip"),
-                        new TooltipTextbox
-                        {
-                            Text = "a textbox with a tooltip",
-                            Size = new Vector2(width,30),
-                        },
-                        slider = new OsuSliderBar<int>
-                        {
-                            Width = width,
-                        },
-                        sliderDouble = new OsuSliderBar<double>
-                        {
-                            Width = width,
-                        },
-                    },
-                },
-            };
-
-            slider.Current.BindTo(new BindableInt(5)
-            {
-                MaxValue = 10,
-                MinValue = 0
-            });
-
-            sliderDouble.Current.BindTo(new BindableDouble(0.5)
-            {
-                MaxValue = 1,
-                MinValue = 0
-            });
-        }
-
-        private class TooltipTextContainer : Container, IHasTooltip
-        {
-            private readonly OsuSpriteText text;
-
-            public string TooltipText => text.Text;
-
-            public TooltipTextContainer(string tooltipText)
-            {
-                AutoSizeAxes = Axes.Both;
-                Children = new[]
-                {
-                    text = new OsuSpriteText
-                    {
-                        Text = tooltipText,
-                    }
-                };
-            }
-        }
-
-        private class TooltipTextbox : OsuTextBox, IHasTooltip
-        {
-            public string TooltipText => Text;
-        }
-    }
-}

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -208,7 +208,6 @@
     <Compile Include="Tests\TestCaseTaikoPlayfield.cs" />
     <Compile Include="Tests\TestCaseTextAwesome.cs" />
     <Compile Include="Tests\TestCasePlaySongSelect.cs" />
-    <Compile Include="Tests\TestCaseTooltip.cs" />
     <Compile Include="Tests\TestCaseTwoLayerButton.cs" />
     <Compile Include="VisualTestGame.cs" />
     <Compile Include="Platform\TestStorage.cs" />

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -28,7 +28,14 @@ namespace osu.Game.Rulesets.Catch
                     {
                         new CatchModEasy(),
                         new CatchModNoFail(),
-                        new CatchModHalfTime(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new CatchModHalfTime(),
+                                new CatchModDaycore(),
+                            },
+                        },
                     };
 
                 case ModType.DifficultyIncrease:

osu.Game.Rulesets.Catch/Mods/CatchMod.cs

@@ -32,6 +32,11 @@ namespace osu.Game.Rulesets.Catch.Mods
 
     }
 
+    public class CatchModDaycore : ModDaycore
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+
     public class CatchModDoubleTime : ModDoubleTime
     {
         public override double ScoreMultiplier => 1.06;

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -27,7 +27,14 @@ namespace osu.Game.Rulesets.Mania
                     {
                         new ManiaModEasy(),
                         new ManiaModNoFail(),
-                        new ManiaModHalfTime(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new ManiaModHalfTime(),
+                                new ManiaModDaycore(),
+                            },
+                        },
                     };
 
                 case ModType.DifficultyIncrease:

osu.Game.Rulesets.Mania/Mods/ManiaMod.cs

@@ -34,6 +34,11 @@ namespace osu.Game.Rulesets.Mania.Mods
 
     }
 
+    public class ManiaModDaycore : ModDaycore
+    {
+        public override double ScoreMultiplier => 0.3;
+    }
+
     public class ManiaModDoubleTime : ModDoubleTime
     {
         public override double ScoreMultiplier => 1.0;

osu.Game.Rulesets.Osu/Mods/OsuMod.cs

@@ -39,6 +39,11 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
     }
 
+    public class OsuModDaycore : ModDaycore
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+
     public class OsuModDoubleTime : ModDoubleTime
     {
         public override double ScoreMultiplier => 1.12;

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -46,7 +46,14 @@ namespace osu.Game.Rulesets.Osu
                     {
                         new OsuModEasy(),
                         new OsuModNoFail(),
-                        new OsuModHalfTime(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new OsuModHalfTime(),
+                                new OsuModDaycore(),
+                            },
+                        },
                     };
 
                 case ModType.DifficultyIncrease:

osu.Game.Rulesets.Taiko/Mods/TaikoMod.cs

@@ -37,6 +37,11 @@ namespace osu.Game.Rulesets.Taiko.Mods
 
     }
 
+    public class TaikoModDaycore : ModDaycore
+    {
+        public override double ScoreMultiplier => 0.5;
+    }
+
     public class TaikoModDoubleTime : ModDoubleTime
     {
         public override double ScoreMultiplier => 1.12;

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -28,7 +28,14 @@ namespace osu.Game.Rulesets.Taiko
                     {
                         new TaikoModEasy(),
                         new TaikoModNoFail(),
-                        new TaikoModHalfTime(),
+                        new MultiMod
+                        {
+                            Mods = new Mod[]
+                            {
+                                new TaikoModHalfTime(),
+                                new TaikoModDaycore(),
+                            },
+                        },
                     };
 
                 case ModType.DifficultyIncrease:

osu.Game/Graphics/Cursor/MenuCursor.cs

@@ -93,6 +93,7 @@ namespace osu.Game.Graphics.Cursor
         {
             private Container cursorContainer;
             private Bindable<double> cursorScale;
+            private const float base_scale = 0.15f;
 
             public Sprite AdditiveLayer;
 
@@ -108,17 +109,15 @@ namespace osu.Game.Graphics.Cursor
                 {
                     cursorContainer = new Container
                     {
-                        Size = new Vector2(32),
+                        AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
                             new Sprite
                             {
-                                FillMode = FillMode.Fit,
                                 Texture = textures.Get(@"Cursor/menu-cursor"),
                             },
                             AdditiveLayer = new Sprite
                             {
-                                FillMode = FillMode.Fit,
                                 BlendingMode = BlendingMode.Additive,
                                 Colour = colour.Pink,
                                 Alpha = 0,
@@ -129,7 +128,7 @@ namespace osu.Game.Graphics.Cursor
                 };
 
                 cursorScale = config.GetBindable<double>(OsuSetting.MenuCursorSize);
-                cursorScale.ValueChanged += newScale => cursorContainer.Scale = new Vector2((float)newScale);
+                cursorScale.ValueChanged += newScale => cursorContainer.Scale = new Vector2((float)newScale * base_scale);
                 cursorScale.TriggerChange();
             }
         }

osu.Game/Graphics/Cursor/OsuTooltipContainer.cs

@@ -0,0 +1,93 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Graphics.Cursor
+{
+    public class OsuTooltipContainer : TooltipContainer
+    {
+        protected override Tooltip CreateTooltip() => new OsuTooltip();
+
+        public OsuTooltipContainer(CursorContainer cursor) : base(cursor)
+        {
+        }
+
+        public class OsuTooltip : Tooltip
+        {
+            private readonly Box background;
+            private readonly OsuSpriteText text;
+
+            public override string TooltipText
+            {
+                set
+                {
+                    if (value == text.Text) return;
+
+                    text.Text = value;
+                    if (Alpha > 0)
+                    {
+                        AutoSizeDuration = 250;
+                        background.FlashColour(OsuColour.Gray(0.4f), 1000, EasingTypes.OutQuint);
+                    }
+                    else
+                        AutoSizeDuration = 0;
+                }
+            }
+
+            private const float text_size = 16;
+
+            public OsuTooltip()
+            {
+                AutoSizeEasing = EasingTypes.OutQuint;
+
+                CornerRadius = 5;
+                Masking = true;
+                EdgeEffect = new EdgeEffect
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Colour = Color4.Black.Opacity(40),
+                    Radius = 5,
+                };
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0.9f,
+                    },
+                    text = new OsuSpriteText
+                    {
+                        TextSize = text_size,
+                        Padding = new MarginPadding(5),
+                        Font = @"Exo2.0-Regular",
+                    }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colour)
+            {
+                background.Colour = colour.Gray3;
+            }
+
+            protected override void PopIn()
+            {
+                FadeIn(500, EasingTypes.OutQuint);
+            }
+
+            protected override void PopOut()
+            {
+                using (BeginDelayedSequence(150))
+                    FadeOut(500, EasingTypes.OutQuint);
+            }
+        }
+    }
+}

osu.Game/Graphics/Cursor/TooltipContainer.cs

@@ -1,157 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input;
-using osu.Framework.Threading;
-using osu.Game.Graphics.Sprites;
-using System.Linq;
-
-namespace osu.Game.Graphics.Cursor
-{
-    public class TooltipContainer : Container
-    {
-        private readonly CursorContainer cursor;
-        private readonly Tooltip tooltip;
-
-        private ScheduledDelegate findTooltipTask;
-        private UserInputManager inputManager;
-
-        private const int default_appear_delay = 220;
-
-        private IHasTooltip currentlyDisplayed;
-
-        public TooltipContainer(CursorContainer cursor)
-        {
-            this.cursor = cursor;
-            AlwaysPresent = true;
-            RelativeSizeAxes = Axes.Both;
-            Add(tooltip = new Tooltip { Alpha = 0 });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(UserInputManager input)
-        {
-            inputManager = input;
-        }
-
-        protected override void Update()
-        {
-            if (tooltip.IsPresent)
-            {
-                if (currentlyDisplayed != null)
-                    tooltip.TooltipText = currentlyDisplayed.TooltipText;
-
-                //update the position of the displayed tooltip.
-                tooltip.Position = ToLocalSpace(cursor.ActiveCursor.ScreenSpaceDrawQuad.Centre) + new Vector2(10);
-            }
-        }
-
-        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
-        {
-            updateTooltipState(state);
-            return base.OnMouseUp(state, args);
-        }
-
-        protected override bool OnMouseMove(InputState state)
-        {
-            updateTooltipState(state);
-            return base.OnMouseMove(state);
-        }
-
-        private void updateTooltipState(InputState state)
-        {
-            if (currentlyDisplayed?.Hovering != true)
-            {
-                if (currentlyDisplayed != null && !state.Mouse.HasMainButtonPressed)
-                {
-                    tooltip.Delay(150);
-                    tooltip.FadeOut(500, EasingTypes.OutQuint);
-                    currentlyDisplayed = null;
-                }
-
-                findTooltipTask?.Cancel();
-                findTooltipTask = Scheduler.AddDelayed(delegate
-                {
-                    var tooltipTarget = inputManager.HoveredDrawables.OfType<IHasTooltip>().FirstOrDefault();
-
-                    if (tooltipTarget == null) return;
-
-                    tooltip.TooltipText = tooltipTarget.TooltipText;
-                    tooltip.FadeIn(500, EasingTypes.OutQuint);
-
-                    currentlyDisplayed = tooltipTarget;
-                }, (1 - tooltip.Alpha) * default_appear_delay);
-            }
-        }
-
-        public class Tooltip : Container
-        {
-            private readonly Box background;
-            private readonly OsuSpriteText text;
-
-            public string TooltipText
-            {
-                set
-                {
-                    if (value == text.Text) return;
-
-                    text.Text = value;
-                    if (Alpha > 0)
-                    {
-                        AutoSizeDuration = 250;
-                        background.FlashColour(OsuColour.Gray(0.4f), 1000, EasingTypes.OutQuint);
-                    }
-                    else
-                        AutoSizeDuration = 0;
-                }
-            }
-
-            public override bool HandleInput => false;
-
-            private const float text_size = 16;
-
-            public Tooltip()
-            {
-                AutoSizeEasing = EasingTypes.OutQuint;
-                AutoSizeAxes = Axes.Both;
-
-                CornerRadius = 5;
-                Masking = true;
-                EdgeEffect = new EdgeEffect
-                {
-                    Type = EdgeEffectType.Shadow,
-                    Colour = Color4.Black.Opacity(40),
-                    Radius = 5,
-                };
-                Children = new Drawable[]
-                {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0.9f,
-                    },
-                    text = new OsuSpriteText
-                    {
-                        TextSize = text_size,
-                        Padding = new MarginPadding(5),
-                        Font = @"Exo2.0-Regular",
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colour)
-            {
-                background.Colour = colour.Gray3;
-            }
-        }
-    }
-}

osu.Game/Graphics/IHasTooltip.cs

@@ -1,15 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Graphics;
-
-namespace osu.Game.Graphics
-{
-    public interface IHasTooltip : IDrawable
-    {
-        /// <summary>
-        /// Tooltip that shows when hovering the drawable
-        /// </summary>
-        string TooltipText { get; }
-    }
-}

osu.Game/Graphics/UserInterface/OsuSliderBar.cs

@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
+using osu.Framework.Graphics.Cursor;
 
 namespace osu.Game.Graphics.UserInterface
 {

osu.Game/OsuGameBase.cs

@@ -158,7 +158,7 @@ namespace osu.Game
                         Children = new Drawable[]
                         {
                             Cursor = new MenuCursor(),
-                            new TooltipContainer(Cursor) { Depth = -1 },
+                            new OsuTooltipContainer(Cursor) { Depth = -1 },
                         }
                     },
                 }

osu.Game/Overlays/Chat/DrawableChannel.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Chat;
@@ -43,11 +44,15 @@ namespace osu.Game.Overlays.Chat
             channel.NewMessagesArrived += newMessagesArrived;
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            newMessagesArrived(Channel.Messages);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
-            newMessagesArrived(Channel.Messages);
             scrollToEnd();
         }
 
@@ -59,13 +64,13 @@ namespace osu.Game.Overlays.Chat
 
         private void newMessagesArrived(IEnumerable<Message> newMessages)
         {
-            if (!IsLoaded) return;
-
             var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY));
 
             //up to last Channel.MAX_HISTORY messages
             flow.Add(displayMessages.Select(m => new ChatLine(m)));
 
+            if (!IsLoaded) return;
+
             if (scroll.IsScrolledToEnd(10) || !flow.Children.Any())
                 scrollToEnd();
 

osu.Game/Overlays/ChatOverlay.cs

@@ -266,20 +266,30 @@ namespace osu.Game.Overlays
 
                 if (channelTabs.ChannelSelectorActive) return;
 
-                if (currentChannel != null)
-                    currentChannelContainer.Clear(false);
-
                 currentChannel = value;
 
+                inputTextBox.Current.Disabled = currentChannel.ReadOnly;
+                channelTabs.Current.Value = value;
+
                 var loaded = loadedChannels.Find(d => d.Channel == value);
                 if (loaded == null)
-                    loadedChannels.Add(loaded = new DrawableChannel(currentChannel));
+                {
+                    currentChannelContainer.FadeOut(500, EasingTypes.OutQuint);
 
-                inputTextBox.Current.Disabled = currentChannel.ReadOnly;
+                    loaded = new DrawableChannel(currentChannel);
-
+                    loadedChannels.Add(loaded);
-                currentChannelContainer.Add(loaded);
+                    LoadComponentAsync(loaded, l =>
-
+                    {
-                channelTabs.Current.Value = value;
+                        currentChannelContainer.Clear(false);
+                        currentChannelContainer.Add(l);
+                        currentChannelContainer.FadeIn(500, EasingTypes.OutQuint);
+                    });
+                }
+                else
+                {
+                    currentChannelContainer.Clear(false);
+                    currentChannelContainer.Add(loaded);
+                }
             }
         }
 

osu.Game/Overlays/Mods/ModButton.cs

@@ -16,7 +16,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using System;
 using System.Linq;
-using osu.Game.Graphics;
+using osu.Framework.Graphics.Cursor;
 
 namespace osu.Game.Overlays.Mods
 {

osu.Game/Rulesets/Mods/ModDaycore.cs

@@ -0,0 +1,25 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Audio;
+using osu.Framework.Timing;
+using osu.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModDaycore : ModHalfTime
+    {
+        public override string Name => "Daycore";
+        public override FontAwesome Icon => FontAwesome.fa_question;
+        public override string Description => "whoaaaaa";
+
+        public override void ApplyToClock(IAdjustableClock clock)
+        {
+            var pitchAdjust = clock as IHasPitchAdjust;
+            if (pitchAdjust != null)
+                pitchAdjust.PitchAdjust = 0.75;
+            else
+                base.ApplyToClock(clock);
+        }
+    }
+}

osu.Game/Rulesets/Mods/ModHalfTime.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override double ScoreMultiplier => 1.12;
 
-        public void ApplyToClock(IAdjustableClock clock)
+        public virtual void ApplyToClock(IAdjustableClock clock)
         {
             clock.Rate = 0.75;
         }

osu.Game/osu.Game.csproj

@@ -105,7 +105,6 @@
     <Compile Include="Graphics\Cursor\CursorTrail.cs" />
     <Compile Include="Graphics\Cursor\GameplayCursor.cs" />
     <Compile Include="Graphics\IHasAccentColour.cs" />
-    <Compile Include="Graphics\IHasTooltip.cs" />
     <Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
     <Compile Include="Graphics\Transforms\TransformAccent.cs" />
     <Compile Include="Graphics\UserInterface\BackButton.cs" />
@@ -118,7 +117,7 @@
     <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
     <Compile Include="Graphics\UserInterface\SimpleComboCounter.cs" />
     <Compile Include="Graphics\UserInterface\TwoLayerButton.cs" />
-    <Compile Include="Graphics\Cursor\TooltipContainer.cs" />
+    <Compile Include="Graphics\Cursor\OsuTooltipContainer.cs" />
     <Compile Include="Input\Handlers\ReplayInputHandler.cs" />
     <Compile Include="IO\Legacy\ILegacySerializable.cs" />
     <Compile Include="IO\Legacy\SerializationReader.cs" />
@@ -126,6 +125,7 @@
     <Compile Include="IO\Serialization\IJsonSerializable.cs" />
     <Compile Include="IPC\ScoreIPCChannel.cs" />
     <Compile Include="Rulesets\BeatmapStatistic.cs" />
+    <Compile Include="Rulesets\Mods\ModDaycore.cs" />
     <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHit.cs" />
     <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHitObjectParser.cs" />
     <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSlider.cs" />