sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cursor_size.

Browse Source
This commit is contained in:
Dean Herbert
2017-05-15 12:21:43 +09:00
parent b6460d89c9 eb55d9a1ae
commit 3b87a938db
64 changed files with 318 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/Cursor/GameplayCursor.cs
View File

@ -123,8 +123,8 @@ namespace osu.Game.Graphics.Cursor
beatmapCircleSize = game.Beatmap.Value?.Beatmap.BeatmapInfo.Difficulty.CircleSize ?? default_circle_size;
cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
autoCursorScale = config.GetBindable<bool>(OsuConfig.AutoCursorSize);
cursorScale = config.GetBindable<double>(OsuSetting.GameplayCursorSize);
autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
cursorScale.ValueChanged += newValue => calculateScale();
autoCursorScale.ValueChanged += newValue => calculateScale();

2
osu.Game/Graphics/Cursor/MenuCursor.cs
View File

@ -128,7 +128,7 @@ namespace osu.Game.Graphics.Cursor
}
};
cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
cursorScale = config.GetBindable<double>(OsuSetting.MenuCursorSize);
cursorScale.ValueChanged += newScale => cursorContainer.Scale = new Vector2((float)newScale);
cursorScale.TriggerChange();
}