RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 03:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into colourable-menu-elements

Browse Source
This commit is contained in:
Dean Herbert 2019-04-01 14:16:36 +09:00 committed by GitHub
commit 14b606f761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
View File

@ -292,7 +292,6 @@ namespace osu.Game.Rulesets.Osu.Replays
{ {
// We add intermediate frames for spinning / following a slider here. // We add intermediate frames for spinning / following a slider here.
case Spinner spinner: case Spinner spinner:
{
Vector2 difference = startPosition - SPINNER_CENTRE; Vector2 difference = startPosition - SPINNER_CENTRE;
float radius = difference.Length; float radius = difference.Length;
@ -315,9 +314,7 @@ namespace osu.Game.Rulesets.Osu.Replays
endFrame.Position = endPosition; endFrame.Position = endPosition;
break; break;
}
case Slider slider: case Slider slider:
{
for (double j = FrameDelay; j < slider.Duration; j += FrameDelay) for (double j = FrameDelay; j < slider.Duration; j += FrameDelay)
{ {
Vector2 pos = slider.StackedPositionAt(j / slider.Duration); Vector2 pos = slider.StackedPositionAt(j / slider.Duration);
@ -327,7 +324,6 @@ namespace osu.Game.Rulesets.Osu.Replays
AddFrameToReplay(new OsuReplayFrame(slider.EndTime, new Vector2(slider.StackedEndPosition.X, slider.StackedEndPosition.Y), action)); AddFrameToReplay(new OsuReplayFrame(slider.EndTime, new Vector2(slider.StackedEndPosition.X, slider.StackedEndPosition.Y), action));
break; break;
} }
}
// We only want to let go of our button if we are at the end of the current replay. Otherwise something is still going on after us so we need to keep the button pressed! // We only want to let go of our button if we are at the end of the current replay. Otherwise something is still going on after us so we need to keep the button pressed!
if (Frames[Frames.Count - 1].Time <= endFrame.Time) if (Frames[Frames.Count - 1].Time <= endFrame.Time)

3
osu.Game/Scoring/Legacy/LegacyScoreParser.cs
View File

@ -145,6 +145,7 @@ namespace osu.Game.Scoring.Legacy
score.Rank = ScoreRank.D; score.Rank = ScoreRank.D;
break; break;
} }
case 1: case 1:
{ {
int totalHits = count50 + count100 + count300 + countMiss; int totalHits = count50 + count100 + count300 + countMiss;
@ -167,6 +168,7 @@ namespace osu.Game.Scoring.Legacy
score.Rank = ScoreRank.D; score.Rank = ScoreRank.D;
break; break;
} }
case 2: case 2:
{ {
int totalHits = count50 + count100 + count300 + countMiss + countKatu; int totalHits = count50 + count100 + count300 + countMiss + countKatu;
@ -186,6 +188,7 @@ namespace osu.Game.Scoring.Legacy
score.Rank = ScoreRank.D; score.Rank = ScoreRank.D;
break; break;
} }
case 3: case 3:
{ {
int totalHits = count50 + count100 + count300 + countMiss + countGeki + countKatu; int totalHits = count50 + count100 + count300 + countMiss + countGeki + countKatu;

10
osu.Game/Skinning/LegacySkinDecoder.cs
View File

@ -16,12 +16,10 @@ namespace osu.Game.Skinning
{ {
line = StripComments(line); line = StripComments(line);
var pair = SplitKeyVal(line);
switch (section) switch (section)
{ {
case Section.General: case Section.General:
{
var pair = SplitKeyVal(line);
switch (pair.Key) switch (pair.Key)
{ {
case @"Name": case @"Name":
@ -36,11 +34,8 @@ namespace osu.Game.Skinning
} }
break; break;
}
case Section.Fonts:
{
var pair = SplitKeyVal(line);
case Section.Fonts:
switch (pair.Key) switch (pair.Key)
{ {
case "HitCirclePrefix": case "HitCirclePrefix":
@ -53,7 +48,6 @@ namespace osu.Game.Skinning
break; break;
} }
}
base.ParseLine(skin, section, line); base.ParseLine(skin, section, line);
} }