h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:58:21 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors

Browse Source
This commit is contained in:
smoogipoo 2018-11-26 11:47:48 +09:00
parent c0fcbc283e
commit 60ffad169f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Mania.Tests/ManiaSelectionBlueprintTestCase.cs
View File

@ -7,8 +7,8 @@ using osu.Framework.Timing;
using osu.Game.Rulesets.Mania.Edit;
using osu.Game.Rulesets.Mania.UI;
using osu.Game.Tests.Visual;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Rulesets.Mania.Tests
{

2
osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
View File

@ -42,7 +42,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
Position = Parent.ToLocalSpace(HitObject.ToScreenSpace(Vector2.Zero));
}
}
public override void Show()
{
@ -54,5 +53,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
{
HitObject.AlwaysAlive = false;
base.Hide();
}
}
}

2
osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.UI.Scrolling;
using osu.Game.Screens.Edit.Compose.Components;
using OpenTK;
using osuTK;
namespace osu.Game.Rulesets.Mania.Edit
{