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

Merge branch 'master' into fix-profile-graph-crash

Browse Source
This commit is contained in:
Bartłomiej Dach
2020-11-10 12:17:12 +01:00
committed by GitHub
parent 833c0b223e ef1036cef1
commit dd873dbd85
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Mods/ModSection.cs
View File

@ -85,6 +85,8 @@ namespace osu.Game.Overlays.Mods
protected override bool OnKeyDown(KeyDownEvent e) protected override bool OnKeyDown(KeyDownEvent e)
{ {
if (e.ControlPressed) return false;
if (ToggleKeys != null) if (ToggleKeys != null)
{ {
var index = Array.IndexOf(ToggleKeys, e.Key); var index = Array.IndexOf(ToggleKeys, e.Key);

2
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -290,7 +290,7 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
public virtual void PopulateScore(ScoreInfo score) public virtual void PopulateScore(ScoreInfo score)
{ {
score.TotalScore = (long)Math.Round(TotalScore.Value); score.TotalScore = (long)Math.Round(GetStandardisedScore());
score.Combo = Combo.Value; score.Combo = Combo.Value;
score.MaxCombo = HighestCombo.Value; score.MaxCombo = HighestCombo.Value;
score.Accuracy = Math.Round(Accuracy.Value, 4); score.Accuracy = Math.Round(Accuracy.Value, 4);

16
osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
View File

@ -295,21 +295,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <returns>Whether a selection was performed.</returns> /// <returns>Whether a selection was performed.</returns>
private bool beginClickSelection(MouseButtonEvent e) private bool beginClickSelection(MouseButtonEvent e)
{ {
Debug.Assert(!clickSelectionBegan);
bool selectedPerformed = true;
foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren) foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
{ {
if (blueprint.IsHovered) if (!blueprint.IsHovered) continue;
{
selectedPerformed &= SelectionHandler.HandleSelectionRequested(blueprint, e); if (SelectionHandler.HandleSelectionRequested(blueprint, e))
clickSelectionBegan = true; return clickSelectionBegan = true;
break;
}
} }
return selectedPerformed; return false;
} }
/// <summary> /// <summary>