h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 05:22:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into refactor-conversion-test

Browse Source
This commit is contained in:
Dean Herbert 2019-08-02 05:34:05 +02:00 committed by GitHub
commit 69c2723d90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -150,7 +150,7 @@ namespace osu.Game.Beatmaps
processor?.PostProcess(); processor?.PostProcess();
foreach (var mod in mods.OfType<IApplicableToBeatmap>()) foreach (var mod in mods.OfType<IApplicableToBeatmap>())
mod.ApplyToBeatmap(Beatmap); mod.ApplyToBeatmap(converted);
return converted; return converted;
} }

11
osu.Game/Graphics/ScreenshotManager.cs
View File

@ -92,7 +92,8 @@ namespace osu.Game.Graphics
using (var image = await host.TakeScreenshotAsync()) using (var image = await host.TakeScreenshotAsync())
{ {
Interlocked.Decrement(ref screenShotTasks); if (Interlocked.Decrement(ref screenShotTasks) == 0 && cursorVisibility.Value == false)
cursorVisibility.Value = true;
var fileName = getFileName(); var fileName = getFileName();
if (fileName == null) return; if (fileName == null) return;
@ -125,14 +126,6 @@ namespace osu.Game.Graphics
} }
}); });
protected override void Update()
{
base.Update();
if (cursorVisibility.Value == false && Interlocked.CompareExchange(ref screenShotTasks, 0, 0) == 0)
cursorVisibility.Value = true;
}
private string getFileName() private string getFileName()
{ {
var dt = DateTime.Now; var dt = DateTime.Now;

1
osu.Game/Online/API/Requests/GetUserBeatmapsRequest.cs
View File

@ -27,6 +27,7 @@ namespace osu.Game.Online.API.Requests
{ {
Favourite, Favourite,
RankedAndApproved, RankedAndApproved,
Loved,
Unranked, Unranked,
Graveyard Graveyard
} }

1
osu.Game/Overlays/Profile/Sections/BeatmapsSection.cs
View File

@ -18,6 +18,7 @@ namespace osu.Game.Overlays.Profile.Sections
{ {
new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User, "Favourite Beatmaps"), new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User, "Favourite Beatmaps"),
new PaginatedBeatmapContainer(BeatmapSetType.RankedAndApproved, User, "Ranked & Approved Beatmaps"), new PaginatedBeatmapContainer(BeatmapSetType.RankedAndApproved, User, "Ranked & Approved Beatmaps"),
new PaginatedBeatmapContainer(BeatmapSetType.Loved, User, "Loved Beatmaps"),
new PaginatedBeatmapContainer(BeatmapSetType.Unranked, User, "Pending Beatmaps"), new PaginatedBeatmapContainer(BeatmapSetType.Unranked, User, "Pending Beatmaps"),
new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, "Graveyarded Beatmaps"), new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, "Graveyarded Beatmaps"),
}; };