sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mania-selection-movement' into inter-column-movements

Browse Source 
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
This commit is contained in:
smoogipoo
2018-11-26 11:45:48 +09:00
parent 55edeb095d 5d6a438f98
commit 56032a4522
488 changed files with 1603 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
View File

@ -15,9 +15,9 @@ using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;
namespace osu.Game.Screens.Edit.Compose.Components
{

2
osu.Game/Screens/Edit/Compose/Components/DragBox.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using OpenTK.Graphics;
using osuTK.Graphics;
namespace osu.Game.Screens.Edit.Compose.Components
{

2
osu.Game/Screens/Edit/Compose/Components/EditorPlayfieldBorder.cs
View File

@ -4,7 +4,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using OpenTK.Graphics;
using osuTK.Graphics;
namespace osu.Game.Screens.Edit.Compose.Components
{

4
osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
View File

@ -13,8 +13,8 @@ using osu.Framework.Input.States;
using osu.Game.Graphics;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects;
using OpenTK;
using OpenTK.Input;
using osuTK;
using osuTK.Input;
namespace osu.Game.Screens.Edit.Compose.Components
{

2
osu.Game/Screens/Edit/Compose/Components/Timeline/CentreMarker.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{

2
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{

4
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
View File

@ -7,8 +7,8 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{

2
osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
View File

@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Input.Events;
using osu.Framework.MathUtils;
using OpenTK;
using osuTK;
namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{