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

Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay

Browse Source
This commit is contained in:
Dan Balasescu
2021-04-02 20:58:29 +09:00
committed by GitHub
parent ecb66ad2e2 dac8e5fdf4
commit 345779b19a
76 changed files with 941 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -438,6 +438,8 @@ namespace osu.Game.Rulesets.Edit
/// </summary>
public abstract bool CursorInPlacementArea { get; }
public virtual string ConvertSelectionToString() => string.Empty;
#region IPositionSnapProvider
public abstract SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);

2
osu.Game/Rulesets/RulesetStore.cs
View File

@ -173,7 +173,7 @@ namespace osu.Game.Rulesets
{
var filename = Path.GetFileNameWithoutExtension(file);
if (loadedAssemblies.Values.Any(t => t.Namespace == filename))
if (loadedAssemblies.Values.Any(t => Path.GetFileNameWithoutExtension(t.Assembly.Location) == filename))
return;
try

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

@ -337,7 +337,7 @@ namespace osu.Game.Rulesets.Scoring
score.TotalScore = (long)Math.Round(GetStandardisedScore());
score.Combo = Combo.Value;
score.MaxCombo = HighestCombo.Value;
score.Accuracy = Math.Round(Accuracy.Value, 4);
score.Accuracy = Accuracy.Value;
score.Rank = Rank.Value;
score.Date = DateTimeOffset.Now;