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

Merge remote-tracking branch 'refs/remotes/upstream/master' into carousel-fixes

Browse Source
This commit is contained in:
Dean Herbert
2016-11-26 17:08:40 +09:00
parent e36a51acf0 82a708d2c0
commit ebab9d66bf
20 changed files with 252 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Play/Player.cs
View File

@ -90,7 +90,7 @@ namespace osu.Game.Screens.Play
hitRenderer.OnMiss += delegate (HitObject h) { scoreOverlay.OnMiss(h); };
if (Autoplay)
hitRenderer.Schedule(() => hitRenderer.DrawableObjects.ForEach(h => h.State = ArmedState.Armed));
hitRenderer.Schedule(() => hitRenderer.DrawableObjects.ForEach(h => h.State = ArmedState.Hit));
Children = new Drawable[]
{

5
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -73,11 +73,8 @@ namespace osu.Game.Screens.Select
}
}
/// <param name="database">Optionally provide a database to use instead of the OsuGame one.</param>
public PlaySongSelect(BeatmapDatabase database = null)
public PlaySongSelect()
{
this.database = database;
const float carouselWidth = 640;
const float bottomToolHeight = 50;
Children = new Drawable[]