Skip to content

Commit 1d06b48

Browse files
authored
Merge pull request #566 from LumpBloom7/dependabot/nuget/ppy.osu.Game-2024.312.0
Bump ppy.osu.Game from 2024.302.0 to 2024.312.0
2 parents 1e80c58 + 6ac7a48 commit 1d06b48

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldCentrePiece.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public TouchHoldCentrePiece()
4444
InnerRadius = 1,
4545
Size = Vector2.One,
4646
RelativeSizeAxes = Axes.Both,
47-
Current = { Value = 1 },
47+
Progress = 1,
4848
Colour = colours.Blue
4949
},
5050
new CircularProgress
@@ -54,7 +54,7 @@ public TouchHoldCentrePiece()
5454
InnerRadius = 1,
5555
Size = Vector2.One,
5656
RelativeSizeAxes = Axes.Both,
57-
Current = { Value = .75 },
57+
Progress = 0.75 ,
5858
Colour = colours.Green
5959
},
6060
new CircularProgress
@@ -64,7 +64,7 @@ public TouchHoldCentrePiece()
6464
InnerRadius = 1,
6565
Size = Vector2.One,
6666
RelativeSizeAxes = Axes.Both,
67-
Current = { Value = .5 },
67+
Progress = 0.5 ,
6868
Colour = colours.Yellow,
6969
},
7070
new CircularProgress
@@ -74,7 +74,7 @@ public TouchHoldCentrePiece()
7474
InnerRadius = 1,
7575
Size = Vector2.One,
7676
RelativeSizeAxes = Axes.Both,
77-
Current = { Value = .25 },
77+
Progress = 0.25 ,
7878
Colour = colours.Red,
7979
},
8080
}

osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldProgressPiece.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public TouchHoldProgressPiece()
4848
InnerRadius = 1,
4949
Size = Vector2.One,
5050
RelativeSizeAxes = Axes.Both,
51-
Current = { Value = 0 },
51+
Progress = 0,
5252
Colour = colours.Blue
5353
},
5454
greenProgress = new CircularProgress
@@ -58,7 +58,7 @@ public TouchHoldProgressPiece()
5858
InnerRadius = 1,
5959
Size = Vector2.One,
6060
RelativeSizeAxes = Axes.Both,
61-
Current = { Value = 0 },
61+
Progress = 0,
6262
Colour = colours.Green
6363
},
6464
yellowProgress = new CircularProgress
@@ -68,7 +68,7 @@ public TouchHoldProgressPiece()
6868
InnerRadius = 1,
6969
Size = Vector2.One,
7070
RelativeSizeAxes = Axes.Both,
71-
Current = { Value = 0 },
71+
Progress = 0,
7272
Colour = colours.Yellow,
7373
},
7474
redProgress = new CircularProgress
@@ -78,7 +78,7 @@ public TouchHoldProgressPiece()
7878
InnerRadius = 1,
7979
Size = Vector2.One,
8080
RelativeSizeAxes = Axes.Both,
81-
Current = { Value = 0 },
81+
Progress = 0,
8282
Colour = colours.Red,
8383
},
8484
}
@@ -87,10 +87,10 @@ public TouchHoldProgressPiece()
8787

8888
ProgressBindable.BindValueChanged(p =>
8989
{
90-
redProgress.Current.Value = Math.Min(p.NewValue, .25);
91-
yellowProgress.Current.Value = Math.Min(p.NewValue, .50);
92-
greenProgress.Current.Value = Math.Min(p.NewValue, .75);
93-
blueProgress.Current.Value = p.NewValue;
90+
redProgress.Progress = Math.Min(p.NewValue, .25);
91+
yellowProgress.Progress = Math.Min(p.NewValue, .50);
92+
greenProgress.Progress = Math.Min(p.NewValue, .75);
93+
blueProgress.Progress = p.NewValue;
9494
});
9595
}
9696
}

osu.Game.Rulesets.Sentakki/UI/Components/HitObjectLine/DrawableLine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected override void PrepareForUse()
5050

5151
Colour = Entry.Colour;
5252
Rotation = Entry.Rotation;
53-
line.Current.Value = Entry.AngleRange;
53+
line.Progress = Entry.AngleRange;
5454
resetAnimation();
5555
}
5656

osu.Game.Rulesets.Sentakki/UI/Components/PlayfieldVisualization.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,13 @@ protected override void Draw(IRenderer renderer)
225225
if (audioData[i] < amplitude_dead_zone)
226226
continue;
227227

228-
float rotation = MathUtils.DegreesToRadians((i / (float)bars_per_visualiser * 360) + (j * 360 / visualiser_rounds));
228+
float rotation = float.DegreesToRadians((i / (float)bars_per_visualiser * 360) + (j * 360 / visualiser_rounds));
229229
float rotationCos = MathF.Cos(rotation);
230230
float rotationSin = MathF.Sin(rotation);
231231
// taking the cos and sin to the 0..1 range
232232
var barPosition = new Vector2((rotationCos / 2) + 0.5f, (rotationSin / 2) + 0.5f) * size;
233233

234-
var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
234+
var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(float.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
235235
// The distance between the position and the sides of the bar.
236236
var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2);
237237
// The distance between the bottom side of the bar and the top side.

osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AssemblyName>osu.Game.Rulesets.Sentakki</AssemblyName>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="ppy.osu.Game" Version="2024.302.0"/>
12+
<PackageReference Include="ppy.osu.Game" Version="2024.312.0"/>
1313
</ItemGroup>
1414

1515
<!--Since we aren't changing the assembly name, we use the assembly title to indicate whether it is a dev build-->

0 commit comments

Comments
 (0)