diff --git a/osu-framework b/osu-framework
index ea2797c611..e63cfd9ba4 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit ea2797c611a494369e1d3292c55f51b19bc5eeb2
+Subproject commit e63cfd9ba44a40750dff0617ba6f08ffbfcc7fde
diff --git a/osu.Desktop.Deploy/App.config b/osu.Desktop.Deploy/App.config
index 45685a74a8..6711f9c54e 100644
--- a/osu.Desktop.Deploy/App.config
+++ b/osu.Desktop.Deploy/App.config
@@ -31,6 +31,10 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
+
+
+
+
\ No newline at end of file
diff --git a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
index 1f9726b573..c6474eae5a 100644
--- a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
+++ b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj
@@ -49,10 +49,6 @@
$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll
True
-
- $(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll
- True
-
$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll
True
@@ -73,15 +69,19 @@
$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll
- $(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll
+ $(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\NuGet.Squirrel.dll
+ True
+
+
+ $(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll
True
$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll
True
-
- $(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll
+
+ $(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\Squirrel.dll
True
diff --git a/osu.Desktop.Deploy/packages.config b/osu.Desktop.Deploy/packages.config
index 4878297be9..3c5ca9f9a3 100644
--- a/osu.Desktop.Deploy/packages.config
+++ b/osu.Desktop.Deploy/packages.config
@@ -7,7 +7,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
-
+
+
-
+
\ No newline at end of file
diff --git a/osu.Desktop.Tests/app.config b/osu.Desktop.Tests/app.config
new file mode 100644
index 0000000000..faeaf001de
--- /dev/null
+++ b/osu.Desktop.Tests/app.config
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/osu.Desktop.Tests/osu.Desktop.Tests.csproj b/osu.Desktop.Tests/osu.Desktop.Tests.csproj
index f0620c98ef..f940e4be9e 100644
--- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj
+++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj
@@ -37,8 +37,9 @@
$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll
-
- $(SolutionDir)\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll
+
+ $(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll
+ True
False
@@ -100,6 +101,7 @@
osu.licenseheader
+
diff --git a/osu.Desktop.Tests/packages.config b/osu.Desktop.Tests/packages.config
index ad51a60195..7bd35a3abe 100644
--- a/osu.Desktop.Tests/packages.config
+++ b/osu.Desktop.Tests/packages.config
@@ -5,7 +5,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
-->
-
+
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index c32d38482a..0712aa7278 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -87,11 +87,13 @@
$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll
-
- $(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll
+
+ $(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll
+ True
-
- $(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll
+
+ $(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll
+ True
False
diff --git a/osu.Desktop.VisualTests/packages.config b/osu.Desktop.VisualTests/packages.config
index cad2ffff0d..2fb1023253 100644
--- a/osu.Desktop.VisualTests/packages.config
+++ b/osu.Desktop.VisualTests/packages.config
@@ -5,8 +5,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
-->
-
-
+
+
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 4f66dfd3eb..5ac888b515 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -121,18 +121,23 @@
- $(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll
+ $(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\NuGet.Squirrel.dll
True
-
- $(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll
+
+ $(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll
+ True
+
+
+ $(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll
+ True
$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll
True
-
- $(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll
+
+ $(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\Squirrel.dll
True
diff --git a/osu.Desktop/packages.config b/osu.Desktop/packages.config
index 60e8182c82..3ad2106d2b 100644
--- a/osu.Desktop/packages.config
+++ b/osu.Desktop/packages.config
@@ -7,7 +7,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
-
+
+
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
index 281d2b5a79..83996df41a 100644
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@@ -33,8 +33,9 @@
false
-
- $(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll
+
+ $(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll
+ True
diff --git a/osu.Game.Rulesets.Catch/packages.config b/osu.Game.Rulesets.Catch/packages.config
index 634d0b51f6..fa6edb9c8f 100644
--- a/osu.Game.Rulesets.Catch/packages.config
+++ b/osu.Game.Rulesets.Catch/packages.config
@@ -5,5 +5,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd .
Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
index 3d5614bd90..154e3d9b3e 100644
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@@ -33,8 +33,9 @@
false
-
- $(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll
+
+ $(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll
+ True
diff --git a/osu.Game.Rulesets.Mania/packages.config b/osu.Game.Rulesets.Mania/packages.config
index 634d0b51f6..fa6edb9c8f 100644
--- a/osu.Game.Rulesets.Mania/packages.config
+++ b/osu.Game.Rulesets.Mania/packages.config
@@ -5,5 +5,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd .
Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
index 7219cf8769..f6f565c502 100644
--- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
+++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
@@ -34,8 +34,9 @@
false
-
- $(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll
+
+ $(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll
+ True
diff --git a/osu.Game.Rulesets.Osu/packages.config b/osu.Game.Rulesets.Osu/packages.config
index 634d0b51f6..fa6edb9c8f 100644
--- a/osu.Game.Rulesets.Osu/packages.config
+++ b/osu.Game.Rulesets.Osu/packages.config
@@ -5,5 +5,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd .
Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
index 8d6fcb503c..f719f2002b 100644
--- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
+++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
@@ -33,8 +33,9 @@
false
-
- $(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll
+
+ $(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll
+ True
diff --git a/osu.Game.Rulesets.Taiko/packages.config b/osu.Game.Rulesets.Taiko/packages.config
index dc059c684b..8add43d5d5 100644
--- a/osu.Game.Rulesets.Taiko/packages.config
+++ b/osu.Game.Rulesets.Taiko/packages.config
@@ -4,5 +4,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd .
Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-
+
\ No newline at end of file
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index b8fcb80aaf..8ec68b41be 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -30,11 +30,13 @@
false
-
- $(SolutionDir)\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll
+
+ $(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll
+ True
-
- $(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll
+
+ $(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll
+ True
diff --git a/osu.Game.Tests/packages.config b/osu.Game.Tests/packages.config
index 9972fb41a1..9ad76308d7 100644
--- a/osu.Game.Tests/packages.config
+++ b/osu.Game.Tests/packages.config
@@ -4,8 +4,8 @@ Copyright (c) 2007-2017 ppy Pty Ltd .
Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-->
-
-
+
+
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
index 61ec859b44..27a888f0b5 100644
--- a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
@@ -1,15 +1,48 @@
// Copyright (c) 2007-2017 ppy Pty Ltd .
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using OpenTK;
namespace osu.Game.Graphics.UserInterface
{
- public class LoadingAnimation : SpriteText
+ public class LoadingAnimation : VisibilityContainer
{
+ private readonly TextAwesome spinner;
+
public LoadingAnimation()
{
- Text = "Loading";
+ Size = new Vector2(20);
+
+ Anchor = Anchor.Centre;
+ Origin = Anchor.Centre;
+
+ Children = new Drawable[]
+ {
+ spinner = new TextAwesome
+ {
+ TextSize = 20,
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Icon = FontAwesome.fa_spinner
+ }
+ };
}
+
+ protected override void LoadComplete()
+ {
+ base.LoadComplete();
+
+ spinner.RotateTo(360, 2000);
+ using (spinner.BeginDelayedSequence(2000))
+ spinner.Loop();
+ }
+
+ private const float transition_duration = 500;
+
+ protected override void PopIn() => FadeIn(transition_duration * 5, EasingTypes.OutQuint);
+
+ protected override void PopOut() => FadeOut(transition_duration, EasingTypes.OutQuint);
}
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 08b40b6079..4f51575da3 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Threading;
-using osu.Game.Graphics.Sprites;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.Chat;
@@ -33,7 +32,9 @@ namespace osu.Game.Overlays
private ScheduledDelegate messageRequest;
- private readonly Container currentChannelContainer;
+ private readonly Container currentChannelContainer;
+
+ private readonly LoadingAnimation loading;
private readonly FocusedTextBox inputTextBox;
@@ -104,7 +105,7 @@ namespace osu.Game.Overlays
{
RelativeSizeAxes = Axes.Both,
},
- currentChannelContainer = new Container
+ currentChannelContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding
@@ -138,7 +139,8 @@ namespace osu.Game.Overlays
HoldFocus = true,
}
}
- }
+ },
+ loading = new LoadingAnimation(),
}
},
new Container
@@ -274,14 +276,7 @@ namespace osu.Game.Overlays
private void initializeChannels()
{
- SpriteText loading;
- Add(loading = new OsuSpriteText
- {
- Text = @"initialising chat...",
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre,
- TextSize = 40,
- });
+ loading.Show();
messageRequest?.Cancel();
@@ -290,9 +285,6 @@ namespace osu.Game.Overlays
{
Scheduler.Add(delegate
{
- loading.FadeOut(100);
- loading.Expire();
-
addChannel(channels.Find(c => c.Name == @"#lazer"));
addChannel(channels.Find(c => c.Name == @"#osu"));
addChannel(channels.Find(c => c.Name == @"#lobby"));
@@ -336,13 +328,17 @@ namespace osu.Game.Overlays
if (loaded == null)
{
currentChannelContainer.FadeOut(500, EasingTypes.OutQuint);
+ loading.Show();
loaded = new DrawableChannel(currentChannel);
loadedChannels.Add(loaded);
LoadComponentAsync(loaded, l =>
{
+ if (currentChannel.Messages.Any())
+ loading.Hide();
+
currentChannelContainer.Clear(false);
- currentChannelContainer.Add(l);
+ currentChannelContainer.Add(loaded);
currentChannelContainer.FadeIn(500, EasingTypes.OutQuint);
});
}
@@ -386,6 +382,7 @@ namespace osu.Game.Overlays
req.Success += delegate (List messages)
{
+ loading.Hide();
channel.AddNewMessages(messages.ToArray());
Debug.Write("success!");
};
diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 9454272728..461eb2595a 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays
State = Visibility.Visible;
}
- private void onDialogOnStateChanged(OverlayContainer dialog, Visibility v)
+ private void onDialogOnStateChanged(VisibilityContainer dialog, Visibility v)
{
if (v != Visibility.Hidden) return;
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 97c27a9ea9..c6ce20f5cf 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -9,6 +9,7 @@ using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Overlays.SearchableList;
@@ -29,6 +30,8 @@ namespace osu.Game.Overlays
protected override SearchableListFilterControl CreateFilterControl() => new FilterControl();
private IEnumerable users;
+ private readonly LoadingAnimation loading;
+
public IEnumerable Users
{
get { return users; }
@@ -68,6 +71,8 @@ namespace osu.Game.Overlays
Spacing = new Vector2(10f),
},
};
+
+ Add(loading = new LoadingAnimation());
}
[BackgroundDependencyLoader]
@@ -83,8 +88,14 @@ namespace osu.Game.Overlays
// no this is not the correct data source, but it's something.
var request = new GetUsersRequest();
- request.Success += res => Users = res.Select(e => e.User);
+ request.Success += res =>
+ {
+ Users = res.Select(e => e.User);
+ loading.Hide();
+ };
+
api.Queue(request);
+ loading.Show();
}
public void APIStateChanged(APIAccess api, APIState state)
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index fa668bad60..976164a53e 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Toolbar
stateContainer.StateChanged -= stateChanged;
}
- private void stateChanged(OverlayContainer c, Visibility state)
+ private void stateChanged(VisibilityContainer c, Visibility state)
{
switch (state)
{
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 2aec489508..aefb9901b6 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -80,8 +80,8 @@ namespace osu.Game.Screens.Select
lookup.Success += res =>
{
if (beatmap != requestedBeatmap)
- //the beatmap has been changed since we started the lookup.
- return;
+ //the beatmap has been changed since we started the lookup.
+ return;
requestedBeatmap.Metrics = res;
Schedule(() => updateMetrics(res));
@@ -89,6 +89,7 @@ namespace osu.Game.Screens.Select
lookup.Failure += e => updateMetrics(null);
api.Queue(lookup);
+ loading.Show();
}
updateMetrics(requestedBeatmap.Metrics, false);
@@ -104,6 +105,9 @@ namespace osu.Game.Screens.Select
var hasRatings = metrics?.Ratings.Any() ?? false;
var hasRetriesFails = (metrics?.Retries.Any() ?? false) && metrics.Fails.Any();
+ if (failOnMissing)
+ loading.Hide();
+
if (hasRatings)
{
var ratings = metrics.Ratings.ToList();
@@ -320,11 +324,13 @@ namespace osu.Game.Screens.Select
}
},
},
- }
+ },
+ loading = new LoadingAnimation()
};
}
private APIAccess api;
+ private readonly LoadingAnimation loading;
[BackgroundDependencyLoader]
private void load(OsuColour colour, APIAccess api)
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 7d97581a29..e560cfe413 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -12,6 +12,7 @@ using System;
using osu.Framework.Allocation;
using osu.Framework.Threading;
using osu.Game.Database;
+using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Scoring;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
@@ -25,6 +26,8 @@ namespace osu.Game.Screens.Select.Leaderboards
public Action ScoreSelected;
+ private readonly LoadingAnimation loading;
+
private IEnumerable scores;
public IEnumerable Scores
{
@@ -86,6 +89,7 @@ namespace osu.Game.Screens.Select.Leaderboards
},
},
},
+ loading = new LoadingAnimation()
};
}
@@ -117,6 +121,7 @@ namespace osu.Game.Screens.Select.Leaderboards
}
private GetScoresRequest getScoresRequest;
+
private void updateScores()
{
if (!IsLoaded) return;
@@ -126,8 +131,14 @@ namespace osu.Game.Screens.Select.Leaderboards
if (api == null || Beatmap == null) return;
+ loading.Show();
+
getScoresRequest = new GetScoresRequest(Beatmap);
- getScoresRequest.Success += r => Scores = r.Scores;
+ getScoresRequest.Success += r =>
+ {
+ Scores = r.Scores;
+ loading.Hide();
+ };
api.Queue(getScoresRequest);
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 68e84a1846..20785463ea 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -39,12 +39,13 @@
$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll
-
- $(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll
+
+ $(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll
+ True
-
- $(SolutionDir)\packages\sharpcompress.0.15.2\lib\net45\SharpCompress.dll
- $(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll
+
+ True
+ $(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll
$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll
diff --git a/osu.Game/packages.config b/osu.Game/packages.config
index d51b0033ed..434f9328ea 100644
--- a/osu.Game/packages.config
+++ b/osu.Game/packages.config
@@ -6,8 +6,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
-
-
+
+