mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 04:02:55 +08:00
Merge branch 'master' into spinner-placement-2
This commit is contained in:
commit
ad49dca86e
@ -7,6 +7,7 @@ using osu.Game.Rulesets.Objects.Types;
|
||||
using osu.Game.Beatmaps.ControlPoints;
|
||||
using osu.Game.Rulesets.Judgements;
|
||||
using osu.Game.Rulesets.Osu.Judgements;
|
||||
using OpenTK;
|
||||
|
||||
namespace osu.Game.Rulesets.Osu.Objects
|
||||
{
|
||||
@ -31,5 +32,10 @@ namespace osu.Game.Rulesets.Osu.Objects
|
||||
}
|
||||
|
||||
public override Judgement CreateJudgement() => new OsuJudgement();
|
||||
|
||||
public override void OffsetPosition(Vector2 offset)
|
||||
{
|
||||
// for now we don't want to allow spinners to be moved around.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -52,7 +52,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
|
||||
AddMaskFor(obj);
|
||||
}
|
||||
|
||||
protected override bool OnMouseDown(MouseDownEvent e)
|
||||
protected override bool OnClick(ClickEvent e)
|
||||
{
|
||||
maskContainer.DeselectAll();
|
||||
return true;
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using osu.Framework.Logging;
|
||||
using SharpRaven;
|
||||
@ -35,6 +36,16 @@ namespace osu.Game.Utils
|
||||
|
||||
if (exception != null)
|
||||
{
|
||||
if (exception is IOException ioe)
|
||||
{
|
||||
// disk full exceptions, see https://stackoverflow.com/a/9294382
|
||||
const int hr_error_handle_disk_full = unchecked((int)0x80070027);
|
||||
const int hr_error_disk_full = unchecked((int)0x80070070);
|
||||
|
||||
if (ioe.HResult == hr_error_handle_disk_full || ioe.HResult == hr_error_disk_full)
|
||||
return;
|
||||
}
|
||||
|
||||
// since we let unhandled exceptions go ignored at times, we want to ensure they don't get submitted on subsequent reports.
|
||||
if (lastException != null &&
|
||||
lastException.Message == exception.Message && exception.StackTrace.StartsWith(lastException.StackTrace))
|
||||
|
Loading…
Reference in New Issue
Block a user