# Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
# Conflicts: # osu.Game/Overlays/DragBar.cs
# Conflicts: # osu.Game/Graphics/Cursor/MenuCursor.cs
Includes fix in OpenTK for focus issues.
# Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj
Conflicts: osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj