Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ppy.osu.Game from 2024.302.0 to 2024.312.0 #566

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Bump ppy.osu.Game from 2024.302.0 to 2024.312.0 #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35c7d24
Bump ppy.osu.Game from 2024.302.0 to 2024.312.0
dependabot[bot] Mar 11, 2024
6ac7a48
Fix things
LumpBloom7 Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldCentrePiece.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public TouchHoldCentrePiece()
InnerRadius = 1,
Size = Vector2.One,
RelativeSizeAxes = Axes.Both,
Current = { Value = 1 },
Progress = 1,
Colour = colours.Blue
},
new CircularProgress
Expand All @@ -54,7 +54,7 @@ public TouchHoldCentrePiece()
InnerRadius = 1,
Size = Vector2.One,
RelativeSizeAxes = Axes.Both,
Current = { Value = .75 },
Progress = 0.75 ,
Colour = colours.Green
},
new CircularProgress
Expand All @@ -64,7 +64,7 @@ public TouchHoldCentrePiece()
InnerRadius = 1,
Size = Vector2.One,
RelativeSizeAxes = Axes.Both,
Current = { Value = .5 },
Progress = 0.5 ,
Colour = colours.Yellow,
},
new CircularProgress
Expand All @@ -74,7 +74,7 @@ public TouchHoldCentrePiece()
InnerRadius = 1,
Size = Vector2.One,
RelativeSizeAxes = Axes.Both,
Current = { Value = .25 },
Progress = 0.25 ,
Colour = colours.Red,
},
}
Expand Down
16 changes: 8 additions & 8 deletions osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldProgressPiece.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public TouchHoldProgressPiece()
InnerRadius = 1,
Size = Vector2.One,
RelativeSizeAxes = Axes.Both,
Current = { Value = 0 },
Progress = 0,
Colour = colours.Blue
},
greenProgress = new CircularProgress
Expand All @@ -58,7 +58,7 @@ public TouchHoldProgressPiece()
InnerRadius = 1,
Size = Vector2.One,
RelativeSizeAxes = Axes.Both,
Current = { Value = 0 },
Progress = 0,
Colour = colours.Green
},
yellowProgress = new CircularProgress
Expand All @@ -68,7 +68,7 @@ public TouchHoldProgressPiece()
InnerRadius = 1,
Size = Vector2.One,
RelativeSizeAxes = Axes.Both,
Current = { Value = 0 },
Progress = 0,
Colour = colours.Yellow,
},
redProgress = new CircularProgress
Expand All @@ -78,7 +78,7 @@ public TouchHoldProgressPiece()
InnerRadius = 1,
Size = Vector2.One,
RelativeSizeAxes = Axes.Both,
Current = { Value = 0 },
Progress = 0,
Colour = colours.Red,
},
}
Expand All @@ -87,10 +87,10 @@ public TouchHoldProgressPiece()

ProgressBindable.BindValueChanged(p =>
{
redProgress.Current.Value = Math.Min(p.NewValue, .25);
yellowProgress.Current.Value = Math.Min(p.NewValue, .50);
greenProgress.Current.Value = Math.Min(p.NewValue, .75);
blueProgress.Current.Value = p.NewValue;
redProgress.Progress = Math.Min(p.NewValue, .25);
yellowProgress.Progress = Math.Min(p.NewValue, .50);
greenProgress.Progress = Math.Min(p.NewValue, .75);
blueProgress.Progress = p.NewValue;
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/UI/Components/HitObjectLine/DrawableLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected override void PrepareForUse()

Colour = Entry.Colour;
Rotation = Entry.Rotation;
line.Current.Value = Entry.AngleRange;
line.Progress = Entry.AngleRange;
resetAnimation();
}

Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Sentakki/UI/Components/PlayfieldVisualization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,13 @@ protected override void Draw(IRenderer renderer)
if (audioData[i] < amplitude_dead_zone)
continue;

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

var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(float.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
// The distance between the position and the sides of the bar.
var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2);
// The distance between the bottom side of the bar and the top side.
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>osu.Game.Rulesets.Sentakki</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2024.302.0"/>
<PackageReference Include="ppy.osu.Game" Version="2024.312.0"/>
</ItemGroup>

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