RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into muted-notification

This commit is contained in:
Craftplacer 2019-10-01 17:26:11 +02:00 committed by GitHub
parent 02c1f490f1 2f877be0c4
commit 4e394e0ed5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 60 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -62,6 +62,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2019.924.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2019.930.0" />
</ItemGroup>
</Project>

9
osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
View File

@ -107,6 +107,15 @@ protected override void LoadComplete()
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
}, api.IsLoggedIn));
AddStep("Show bancho", () => profile.ShowUser(new User
{
Username = @"BanchoBot",
Id = 3,
IsBot = true,
Country = new Country { FullName = @"Saint Helena", FlagName = @"SH" },
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg"
}, api.IsLoggedIn));
AddStep("Hide", profile.Hide);
AddStep("Show without reload", profile.Show);
}

40
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
View File

@ -82,8 +82,8 @@ private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null)
private void ensureRandomFetchSuccess() =>
AddAssert("ensure prev random fetch worked", () => selectedSets.Peek() == carousel.SelectedBeatmapSet);
private void checkSelected(int set, int? diff = null) =>
AddAssert($"selected is set{set}{(diff.HasValue ? $" diff{diff.Value}" : "")}", () =>
private void waitForSelection(int set, int? diff = null) =>
AddUntilStep($"selected is set{set}{(diff.HasValue ? $" diff{diff.Value}" : "")}", () =>
{
if (diff != null)
return carousel.SelectedBeatmap == carousel.BeatmapSets.Skip(set - 1).First().Beatmaps.Skip(diff.Value - 1).First();
@ -168,24 +168,24 @@ public void TestTraversal()
loadBeatmaps();
advanceSelection(direction: 1, diff: false);
checkSelected(1, 1);
waitForSelection(1, 1);
advanceSelection(direction: 1, diff: true);
checkSelected(1, 2);
waitForSelection(1, 2);
advanceSelection(direction: -1, diff: false);
checkSelected(set_count, 1);
waitForSelection(set_count, 1);
advanceSelection(direction: -1, diff: true);
checkSelected(set_count - 1, 3);
waitForSelection(set_count - 1, 3);
advanceSelection(diff: false);
advanceSelection(diff: false);
checkSelected(1, 2);
waitForSelection(1, 2);
advanceSelection(direction: -1, diff: true);
advanceSelection(direction: -1, diff: true);
checkSelected(set_count, 3);
waitForSelection(set_count, 3);
}
/// <summary>
@ -203,10 +203,10 @@ public void TestFiltering()
AddStep("Filter", () => carousel.Filter(new FilterCriteria { SearchText = "set #3!" }, false));
checkVisibleItemCount(diff: false, count: 1);
checkVisibleItemCount(diff: true, count: 3);
checkSelected(3, 1);
waitForSelection(3, 1);
advanceSelection(diff: true, count: 4);
checkSelected(3, 2);
waitForSelection(3, 2);
AddStep("Un-filter (debounce)", () => carousel.Filter(new FilterCriteria()));
AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask);
@ -217,10 +217,10 @@ public void TestFiltering()
setSelected(1, 2);
AddStep("Filter some difficulties", () => carousel.Filter(new FilterCriteria { SearchText = "Normal" }, false));
checkSelected(1, 1);
waitForSelection(1, 1);
AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
checkSelected(1, 1);
waitForSelection(1, 1);
AddStep("Filter all", () => carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false));
@ -249,7 +249,7 @@ public void TestFiltering()
IsLowerInclusive = true
}
}, false));
checkSelected(3, 2);
waitForSelection(3, 2);
AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
}
@ -317,7 +317,7 @@ public void TestAddRemove()
checkVisibleItemCount(false, set_count);
checkSelected(set_count);
waitForSelection(set_count);
}
/// <summary>
@ -343,11 +343,11 @@ public void TestRemoveAll()
AddAssert("Selection is non-null", () => currentSelection != null);
AddStep("Remove selected", () => carousel.RemoveBeatmapSet(carousel.SelectedBeatmapSet));
checkSelected(2);
waitForSelection(2);
AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First()));
AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First()));
checkSelected(1);
waitForSelection(1);
AddUntilStep("Remove all", () =>
{
@ -390,17 +390,17 @@ public void TestHiding()
checkVisibleItemCount(true, 2);
advanceSelection(true);
checkSelected(1, 3);
waitForSelection(1, 3);
setHidden(3);
checkSelected(1, 1);
waitForSelection(1, 1);
setHidden(2, false);
advanceSelection(true);
checkSelected(1, 2);
waitForSelection(1, 2);
setHidden(1);
checkSelected(1, 2);
waitForSelection(1, 2);
setHidden(2);
checkNoSelection();

3
osu.Game/Configuration/IntroSequence.cs
View File

@ -6,6 +6,7 @@ namespace osu.Game.Configuration
public enum IntroSequence
{
Circles,
Triangles
Triangles,
Random
}
}

2
osu.Game/Overlays/MusicController.cs
View File

@ -75,7 +75,7 @@ public void ChangeBeatmapSetPosition(BeatmapSetInfo beatmapSetInfo, int index)
/// <summary>
/// Returns whether the current beatmap track is playing.
/// </summary>
public bool IsPlaying => beatmap.Value.Track.IsRunning;
public bool IsPlaying => beatmap.Value?.Track.IsRunning ?? false;
private void handleBeatmapAdded(BeatmapSetInfo set) =>
Schedule(() => beatmapSets.Add(set));

25
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -44,16 +44,21 @@ public void ShowUser(User user, bool fetchOnline = true)
Clear();
lastSection = null;
sections = new ProfileSection[]
{
//new AboutSection(),
new RecentSection(),
new RanksSection(),
//new MedalsSection(),
new HistoricalSection(),
new BeatmapsSection(),
new KudosuSection()
};
sections = !user.IsBot
? new ProfileSection[]
{
//new AboutSection(),
new RecentSection(),
new RanksSection(),
//new MedalsSection(),
new HistoricalSection(),
new BeatmapsSection(),
new KudosuSection()
}
: new ProfileSection[]
{
//new AboutSection(),
};
tabs = new ProfileTabControl
{

4
osu.Game/Rulesets/RulesetStore.cs
View File

@ -135,9 +135,9 @@ private static void loadFromDisk()
foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
loadRulesetFromFile(file);
}
catch
catch (Exception e)
{
Logger.Log($"Could not load rulesets from directory {Environment.CurrentDirectory}");
Logger.Error(e, $"Could not load rulesets from directory {Environment.CurrentDirectory}");
}
}

4
osu.Game/Screens/Loader.cs
View File

@ -6,6 +6,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shaders;
using osu.Framework.MathUtils;
using osu.Game.Screens.Menu;
using osuTK;
using osu.Framework.Screens;
@ -59,6 +60,9 @@ protected virtual OsuScreen CreateLoadableScreen()
private IntroScreen getIntroSequence()
{
if (introSequence == IntroSequence.Random)
introSequence = (IntroSequence)RNG.Next(0, (int)IntroSequence.Random);
switch (introSequence)
{
case IntroSequence.Circles:

3
osu.Game/Users/User.cs
View File

@ -78,6 +78,9 @@ public class UserCover
[JsonProperty(@"is_bng")]
public bool IsBNG;
[JsonProperty(@"is_bot")]
public bool IsBot;
[JsonProperty(@"is_active")]
public bool Active;

2
osu.Game/osu.Game.csproj
View File

@ -26,7 +26,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.924.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.930.0" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" />

4
osu.iOS.props
View File

@ -118,8 +118,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.913.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.924.0" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.924.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.930.0" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2019.930.0" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" />