Merge branch 'master' into remove-osu-checkbox-bindable

README.md

@@ -24,9 +24,9 @@ Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh
 
 ![](https://puu.sh/DCmvA/f6a74f5fbb.png)
 
-If you are not interested in developing the game, you can consume our [binary releases](https://github.com/ppy/osu/releases).
+If you are not interested in developing the game, you can still consume our [binary releases](https://github.com/ppy/osu/releases).
 
-**Latest build:***
+**Latest build:**
 
 | [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) |
 | ------------- | ------------- |

osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -39,8 +40,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Both,
                 Width = 0.8f,
                 Children = new Drawable[]
                 {
@@ -173,7 +173,9 @@ namespace osu.Game.Tests.Visual.Online
                 s.Statistics.Add(HitResult.Miss, RNG.Next(2000));
             }
 
-            scoresContainer.Scores = scores;
+            AddStep("Load all scores", () => scoresContainer.Scores = scores);
+            AddStep("Load null scores", () => scoresContainer.Scores = null);
+            AddStep("Load only one score", () => scoresContainer.Scores = new[] { scores.First() });
         }
 
         [BackgroundDependencyLoader]

osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs

@@ -39,13 +39,27 @@ namespace osu.Game.Tests.Visual.Online
             header = new ProfileHeader();
             Add(header);
 
-            AddStep("Show offline dummy", () => header.User.Value = TestSceneUserProfileOverlay.TEST_USER);
+            AddStep("Show test dummy", () => header.User.Value = TestSceneUserProfileOverlay.TEST_USER);
 
             AddStep("Show null dummy", () => header.User.Value = new User
             {
                 Username = "Null"
             });
 
+            AddStep("Show online dummy", () => header.User.Value = new User
+            {
+                Username = "IAmOnline",
+                LastVisit = DateTimeOffset.Now,
+                IsOnline = true,
+            });
+
+            AddStep("Show offline dummy", () => header.User.Value = new User
+            {
+                Username = "IAmOffline",
+                LastVisit = DateTimeOffset.Now,
+                IsOnline = false,
+            });
+
             addOnlineStep("Show ppy", new User
             {
                 Username = @"peppy",

osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs

@@ -214,37 +214,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("start not requested", () => !startRequested);
         }
 
-        [Test]
-        public void TestAddNewBeatmapWhileSelectingRandom()
-        {
-            const int test_count = 10;
-            int beatmapChangedCount = 0;
-            int debounceCount = 0;
-            createSongSelect();
-            AddStep("Setup counters", () =>
-            {
-                beatmapChangedCount = 0;
-                debounceCount = 0;
-                songSelect.Carousel.SelectionChanged += _ => beatmapChangedCount++;
-            });
-            AddRepeatStep($"Create beatmaps {test_count} times", () =>
-            {
-                importForRuleset(0);
-
-                Scheduler.AddDelayed(() =>
-                {
-                    // Wait for debounce
-                    songSelect.Carousel.SelectNextRandom();
-                    ++debounceCount;
-                }, 400);
-            }, test_count);
-
-            AddUntilStep("Debounce limit reached", () => debounceCount == test_count);
-
-            // The selected beatmap should have changed an additional 2 times since both initially loading songselect and the first import also triggers selectionChanged
-            AddAssert($"Beatmap changed {test_count + 2} times", () => beatmapChangedCount == test_count + 2);
-        }
-
         [Test]
         public void TestHideSetSelectsCorrectBeatmap()
         {

osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs

@@ -24,11 +24,10 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [Description("mod select and icon display")]
-    public class TestSceneMods : OsuTestScene
+    public class TestSceneModSelectOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(ModSelectOverlay),
             typeof(ModDisplay),
             typeof(ModSection),
             typeof(ModIcon),

osu.Game/Graphics/UserInterface/OsuButton.cs

@@ -17,11 +17,11 @@ namespace osu.Game.Graphics.UserInterface
     /// <summary>
     /// A button with added default sound effects.
     /// </summary>
-    public abstract class OsuButton : Button
+    public class OsuButton : Button
     {
         private Box hover;
 
-        protected OsuButton()
+        public OsuButton()
         {
             Height = 40;
 

osu.Game/Online/Chat/Message.cs

@@ -13,10 +13,6 @@ namespace osu.Game.Online.Chat
         [JsonProperty(@"message_id")]
         public readonly long? Id;
 
-        //todo: this should be inside sender.
-        [JsonProperty(@"sender_id")]
-        public long UserId;
-
         [JsonProperty(@"channel_id")]
         public long ChannelId;
 

osu.Game/OsuGame.cs

@@ -181,7 +181,7 @@ namespace osu.Game
             configSkin.ValueChanged += skinId => SkinManager.CurrentSkinInfo.Value = SkinManager.Query(s => s.ID == skinId.NewValue) ?? SkinInfo.Default;
             configSkin.TriggerChange();
 
-            LocalConfig.BindWith(OsuSetting.VolumeInactive, inactiveVolumeAdjust);
+            LocalConfig.BindWith(OsuSetting.VolumeInactive, userInactiveVolume);
 
             IsActive.BindValueChanged(active => updateActiveState(active.NewValue), true);
         }
@@ -686,16 +686,28 @@ namespace osu.Game
             return false;
         }
 
-        private readonly BindableDouble inactiveVolumeAdjust = new BindableDouble();
+        #region Inactive audio dimming
+
+        private readonly BindableDouble userInactiveVolume = new BindableDouble();
+
+        private readonly BindableDouble inactiveVolumeFade = new BindableDouble();
 
         private void updateActiveState(bool isActive)
         {
             if (isActive)
-                Audio.RemoveAdjustment(AdjustableProperty.Volume, inactiveVolumeAdjust);
+            {
+                this.TransformBindableTo(inactiveVolumeFade, 1, 500, Easing.OutQuint)
+                    .Finally(_ => Audio.RemoveAdjustment(AdjustableProperty.Volume, inactiveVolumeFade)); //wait for the transition to finish to remove the inactive audio adjustment
+            }
             else
-                Audio.AddAdjustment(AdjustableProperty.Volume, inactiveVolumeAdjust);
+            {
+                Audio.AddAdjustment(AdjustableProperty.Volume, inactiveVolumeFade);
+                this.TransformBindableTo(inactiveVolumeFade, userInactiveVolume.Value, 1500, Easing.OutSine);
+            }
         }
 
+        #endregion
+
         public bool OnReleased(GlobalAction action) => false;
 
         private Container overlayContent;

osu.Game/Overlays/BeatmapSet/Header.cs

@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.BeatmapSet
             ExternalLinkButton externalLink;
 
             RelativeSizeAxes = Axes.X;
-            Height = 400;
+            AutoSizeAxes = Axes.Y;
             Masking = true;
 
             EdgeEffect = new EdgeEffectParameters
@@ -72,7 +72,8 @@ namespace osu.Game.Overlays.BeatmapSet
                 },
                 new Container
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     Padding = new MarginPadding { Top = tabs_height },
                     Children = new Drawable[]
                     {
@@ -84,6 +85,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 cover = new UpdateableBeatmapSetCover
                                 {
                                     RelativeSizeAxes = Axes.Both,
+                                    Masking = true,
                                 },
                                 new Box
                                 {
@@ -94,18 +96,26 @@ namespace osu.Game.Overlays.BeatmapSet
                         },
                         new Container
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Top = 20, Bottom = 30, Horizontal = BeatmapSetOverlay.X_PADDING },
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding
+                            {
+                                Top = 20,
+                                Bottom = 30,
+                                Left = BeatmapSetOverlay.X_PADDING,
+                                Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
+                            },
                             Child = new FillFlowContainer
                             {
-                                RelativeSizeAxes = Axes.Both,
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Vertical,
                                 Children = new Drawable[]
                                 {
                                     new Container
                                     {
                                         RelativeSizeAxes = Axes.X,
-                                        Height = 113,
+                                        AutoSizeAxes = Axes.Y,
                                         Child = Picker = new BeatmapPicker(),
                                     },
                                     new FillFlowContainer
@@ -158,7 +168,7 @@ namespace osu.Game.Overlays.BeatmapSet
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight,
                             AutoSizeAxes = Axes.Both,
-                            Margin = new MarginPadding { Right = BeatmapSetOverlay.X_PADDING },
+                            Margin = new MarginPadding { Top = BeatmapSetOverlay.TOP_PADDING, Right = BeatmapSetOverlay.X_PADDING },
                             Direction = FillDirection.Vertical,
                             Spacing = new Vector2(10),
                             Children = new Drawable[]

osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs

@@ -124,6 +124,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             loading = false;
 
             scoreTable.Scores = scores?.Count > 1 ? scores : new List<ScoreInfo>();
+            scoreTable.FadeTo(scores?.Count > 1 ? 1 : 0);
 
             if (scores?.Any() == true)
             {

osu.Game/Overlays/BeatmapSetOverlay.cs

@@ -24,6 +24,7 @@ namespace osu.Game.Overlays
         private const int fade_duration = 300;
 
         public const float X_PADDING = 40;
+        public const float TOP_PADDING = 25;
         public const float RIGHT_WIDTH = 275;
 
         private readonly Header header;

osu.Game/Overlays/Mods/ModSection.cs

@@ -50,6 +50,18 @@ namespace osu.Game.Overlays.Mods
 
                 ButtonsContainer.Children = modContainers;
                 buttons = modContainers.OfType<ModButton>().ToArray();
+
+                if (value.Any())
+                {
+                    headerLabel.FadeIn(200);
+                    this.FadeIn(200);
+                }
+                else
+                {
+                    // transition here looks weird as mods instantly disappear.
+                    headerLabel.Hide();
+                    Hide();
+                }
             }
         }
 

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -172,6 +172,8 @@ namespace osu.Game.Overlays.Mods
                                     AutoSizeAxes = Axes.Y,
                                     Spacing = new Vector2(0f, 10f),
                                     Width = content_width,
+                                    LayoutDuration = 200,
+                                    LayoutEasing = Easing.OutQuint,
                                     Children = new ModSection[]
                                     {
                                         new DifficultyReductionSection { Action = modButtonPressed },

osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs

@@ -87,7 +87,12 @@ namespace osu.Game.Overlays.Profile.Header
 
             addSpacer(topLinkContainer);
 
-            if (user.LastVisit.HasValue)
+            if (user.IsOnline)
+            {
+                topLinkContainer.AddText("Currently online");
+                addSpacer(topLinkContainer);
+            }
+            else if (user.LastVisit.HasValue)
             {
                 topLinkContainer.AddText("Last seen ");
                 topLinkContainer.AddText(new DrawableDate(user.LastVisit.Value), embolden);

osu.Game/Overlays/Settings/SettingsItem.cs

@@ -63,6 +63,9 @@ namespace osu.Game.Overlays.Settings
 
             set
             {
+                if (bindable != null)
+                    controlWithCurrent?.Current.UnbindFrom(bindable);
+
                 bindable = value;
                 controlWithCurrent?.Current.BindTo(bindable);
 

osu.Game/Screens/Menu/MainMenu.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Menu
     {
         private ButtonSystem buttons;
 
-        public override bool HideOverlaysOnEnter => buttons.State == ButtonSystemState.Initial;
+        public override bool HideOverlaysOnEnter => buttons == null || buttons.State == ButtonSystemState.Initial;
 
         protected override bool AllowBackButton => buttons.State != ButtonSystemState.Initial && host.CanExit;
 

osu.Game/Screens/Multi/Multiplayer.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
@@ -185,6 +186,28 @@ namespace osu.Game.Screens.Multi
         {
             this.FadeIn();
             waves.Show();
+
+            beginHandlingTrack();
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            this.FadeIn(250);
+            this.ScaleTo(1, 250, Easing.OutSine);
+
+            base.OnResuming(last);
+
+            beginHandlingTrack();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            this.ScaleTo(1.1f, 250, Easing.InSine);
+            this.FadeOut(250);
+
+            endHandlingTrack();
+
+            roomManager.TimeBetweenPolls = 0;
         }
 
         public override bool OnExiting(IScreen next)
@@ -193,12 +216,10 @@ namespace osu.Game.Screens.Multi
 
             this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
 
-            cancelLooping();
-
             if (screenStack.CurrentScreen != null)
                 loungeSubScreen.MakeCurrent();
 
-            updatePollingRate(isIdle.Value);
+            endHandlingTrack();
 
             base.OnExiting(next);
             return false;
@@ -212,23 +233,58 @@ namespace osu.Game.Screens.Multi
             logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut();
         }
 
-        public override void OnResuming(IScreen last)
+        private void beginHandlingTrack()
         {
-            this.FadeIn(250);
-            this.ScaleTo(1, 250, Easing.OutSine);
-
-            base.OnResuming(last);
-
-            updatePollingRate(isIdle.Value);
+            Beatmap.BindValueChanged(updateTrack, true);
         }
 
-        public override void OnSuspending(IScreen next)
+        private void endHandlingTrack()
         {
-            this.ScaleTo(1.1f, 250, Easing.InSine);
-            this.FadeOut(250);
-
             cancelLooping();
-            roomManager.TimeBetweenPolls = 0;
+            Beatmap.ValueChanged -= updateTrack;
+        }
+
+        private void screenPushed(IScreen lastScreen, IScreen newScreen) => subScreenChanged(newScreen);
+
+        private void screenExited(IScreen lastScreen, IScreen newScreen)
+        {
+            subScreenChanged(newScreen);
+
+            if (screenStack.CurrentScreen == null && this.IsCurrentScreen())
+                this.Exit();
+        }
+
+        private void subScreenChanged(IScreen newScreen)
+        {
+            updatePollingRate(isIdle.Value);
+            createButton.FadeTo(newScreen is MatchSubScreen ? 0 : 1, 200);
+
+            updateTrack();
+        }
+
+        private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
+        {
+            bool isMatch = screenStack.CurrentScreen is MatchSubScreen;
+
+            Beatmap.Disabled = isMatch;
+
+            if (isMatch)
+            {
+                var track = Beatmap.Value?.Track;
+
+                if (track != null)
+                {
+                    track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+                    track.Looping = true;
+
+                    if (!track.IsRunning)
+                        track.Restart();
+                }
+            }
+            else
+            {
+                cancelLooping();
+            }
         }
 
         private void cancelLooping()
@@ -236,49 +292,10 @@ namespace osu.Game.Screens.Multi
             var track = Beatmap?.Value?.Track;
 
             if (track != null)
-                track.Looping = false;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (!this.IsCurrentScreen()) return;
-
-            if (screenStack.CurrentScreen is MatchSubScreen)
             {
-                var track = Beatmap.Value.Track;
-
-                if (track != null)
-                {
-                    track.Looping = true;
-
-                    if (!track.IsRunning)
-                    {
-                        game.Audio.AddItem(track);
-                        track.Seek(Beatmap.Value.Metadata.PreviewTime);
-                        track.Start();
-                    }
-                }
-
-                createButton.Hide();
+                track.Looping = false;
+                track.RestartPoint = 0;
             }
-            else if (screenStack.CurrentScreen is LoungeSubScreen)
-                createButton.Show();
-        }
-
-        private void screenPushed(IScreen lastScreen, IScreen newScreen)
-            => updatePollingRate(isIdle.Value);
-
-        private void screenExited(IScreen lastScreen, IScreen newScreen)
-        {
-            if (lastScreen is MatchSubScreen)
-                cancelLooping();
-
-            updatePollingRate(isIdle.Value);
-
-            if (screenStack.CurrentScreen == null && this.IsCurrentScreen())
-                this.Exit();
         }
 
         protected override void Dispose(bool isDisposing)

osu.Game/Users/User.cs

@@ -78,6 +78,9 @@ namespace osu.Game.Users
         [JsonProperty(@"is_active")]
         public bool Active;
 
+        [JsonProperty(@"is_online")]
+        public bool IsOnline;
+
         [JsonProperty(@"pm_friends_only")]
         public bool PMFriendsOnly;
 

osu.Game/osu.Game.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.609.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.615.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.618.0" />
     <PackageReference Include="SharpCompress" Version="0.23.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.iOS.props

@@ -105,8 +105,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.609.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.615.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.615.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.618.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.618.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />