mirror of
https://github.com/ppy/osu
synced 2024-12-15 03:16:17 +00:00
Merge branch 'master' into colourable-menu-elements
This commit is contained in:
commit
14b606f761
@ -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);
|
||||||
@ -326,7 +323,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!
|
||||||
|
@ -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;
|
||||||
|
@ -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":
|
||||||
@ -52,7 +47,6 @@ namespace osu.Game.Skinning
|
|||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
base.ParseLine(skin, section, line);
|
base.ParseLine(skin, section, line);
|
||||||
|
Loading…
Reference in New Issue
Block a user