diff --git a/osu.Desktop/osu.nuspec b/osu.Desktop/osu.nuspec index 66b3970351..8faaade5fc 100644 --- a/osu.Desktop/osu.nuspec +++ b/osu.Desktop/osu.nuspec @@ -7,8 +7,7 @@ <authors>ppy Pty Ltd</authors> <owners>Dean Herbert</owners> <projectUrl>https://osu.ppy.sh/</projectUrl> - <iconUrl>https://github.com/ppy/osu/blob/master/assets/lazer-nuget.png?raw=true</iconUrl> - <icon>icon.png</icon> + <iconUrl>https://puu.sh/tYyXZ/9a01a5d1b0.ico</iconUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>A free-to-win rhythm game. Rhythm is just a *click* away!</description> <releaseNotes>testing</releaseNotes> diff --git a/osu.Game/Graphics/Backgrounds/TrianglesV2.cs b/osu.Game/Graphics/Backgrounds/TrianglesV2.cs index 4143a6d76d..706b05f5ad 100644 --- a/osu.Game/Graphics/Backgrounds/TrianglesV2.cs +++ b/osu.Game/Graphics/Backgrounds/TrianglesV2.cs @@ -1,17 +1,17 @@ // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.Utils; +using osuTK; using System; -using System.Collections.Generic; +using osu.Framework.Graphics.Shaders; +using osu.Framework.Graphics.Textures; +using osu.Framework.Graphics.Primitives; using osu.Framework.Allocation; +using System.Collections.Generic; +using osu.Framework.Graphics.Rendering; using osu.Framework.Bindables; using osu.Framework.Graphics; -using osu.Framework.Graphics.Primitives; -using osu.Framework.Graphics.Rendering; -using osu.Framework.Graphics.Shaders; -using osu.Framework.Graphics.Textures; -using osu.Framework.Utils; -using osuTK; namespace osu.Game.Graphics.Backgrounds { @@ -27,8 +27,6 @@ public partial class TrianglesV2 : Drawable public float Thickness { get; set; } = 0.02f; // No need for invalidation since it's happening in Update() - public float ScaleAdjust { get; set; } = 1; - /// <summary> /// Whether we should create new triangles as others expire. /// </summary> @@ -108,7 +106,7 @@ protected override void Update() parts[i] = newParticle; - float bottomPos = parts[i].Position.Y + triangle_size * ScaleAdjust * equilateral_triangle_ratio / DrawHeight; + float bottomPos = parts[i].Position.Y + triangle_size * equilateral_triangle_ratio / DrawHeight; if (bottomPos < 0) parts.RemoveAt(i); } @@ -151,7 +149,7 @@ private TriangleParticle createTriangle(bool randomY) if (randomY) { // since triangles are drawn from the top - allow them to be positioned a bit above the screen - float maxOffset = triangle_size * ScaleAdjust * equilateral_triangle_ratio / DrawHeight; + float maxOffset = triangle_size * equilateral_triangle_ratio / DrawHeight; y = Interpolation.ValueAt(nextRandom(), -maxOffset, 1f, 0f, 1f); } @@ -190,7 +188,7 @@ private class TrianglesDrawNode : DrawNode private readonly List<TriangleParticle> parts = new List<TriangleParticle>(); - private Vector2 triangleSize; + private readonly Vector2 triangleSize = new Vector2(1f, equilateral_triangle_ratio) * triangle_size; private Vector2 size; private float thickness; @@ -211,7 +209,6 @@ public override void ApplyState() size = Source.DrawSize; thickness = Source.Thickness; clampAxes = Source.ClampAxes; - triangleSize = new Vector2(1f, equilateral_triangle_ratio) * triangle_size * Source.ScaleAdjust; Quad triangleQuad = new Quad( Vector2Extensions.Transform(Vector2.Zero, DrawInfo.Matrix), diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs index 31f47c1349..e06ec11213 100644 --- a/osu.Game/Screens/Menu/OsuLogo.cs +++ b/osu.Game/Screens/Menu/OsuLogo.cs @@ -10,7 +10,6 @@ using osu.Framework.Audio.Track; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; -using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Sprites; @@ -32,13 +31,15 @@ namespace osu.Game.Screens.Menu /// </summary> public partial class OsuLogo : BeatSyncedContainer { + public readonly Color4 OsuPink = Color4Extensions.FromHex(@"e967a1"); + private const double transition_length = 300; /// <summary> /// The osu! logo sprite has a shadow included in its texture. /// This adjustment vector is used to match the precise edge of the border of the logo. /// </summary> - public static readonly Vector2 SCALE_ADJUST = new Vector2(0.94f); + public static readonly Vector2 SCALE_ADJUST = new Vector2(0.96f); private readonly Sprite logo; private readonly CircularContainer logoContainer; @@ -61,7 +62,7 @@ public partial class OsuLogo : BeatSyncedContainer protected Sample SampleDownbeat; private readonly Container colourAndTriangles; - private readonly TrianglesV2 triangles; + private readonly Triangles triangles; /// <summary> /// Return value decides whether the logo should play its own sample for the click action. @@ -187,16 +188,13 @@ public OsuLogo() new Box { RelativeSizeAxes = Axes.Both, - Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex(@"ff66ab"), Color4Extensions.FromHex(@"cc5289")), + Colour = OsuPink, }, - triangles = new TrianglesV2 + triangles = new Triangles { - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Thickness = 0.009f, - ScaleAdjust = 3, - SpawnRatio = 1.4f, - Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex(@"ff66ab"), Color4Extensions.FromHex(@"b6346f")), + TriangleScale = 4, + ColourLight = Color4Extensions.FromHex(@"ff7db7"), + ColourDark = Color4Extensions.FromHex(@"de5b95"), RelativeSizeAxes = Axes.Both, }, }
diff --git a/osu.Game/Users/Drawables/UpdateableTeamFlag.cs b/osu.Game/Users/Drawables/UpdateableTeamFlag.cs index 9c2bbb7e3e..3a65f20e22 100644 --- a/osu.Game/Users/Drawables/UpdateableTeamFlag.cs +++ b/osu.Game/Users/Drawables/UpdateableTeamFlag.cs @@ -32,7 +32,8 @@ public APITeam? Team public UpdateableTeamFlag(APITeam? team = null) { - Team = team; + //Team = team; + Team = null; Masking = true; } @@ -47,7 +48,8 @@ public UpdateableTeamFlag(APITeam? team = null) // Generally we just want team flags to disappear if the user doesn't have one. // This also handles fill flow cases and avoids spacing being added for non-displaying flags. - public override bool IsPresent => base.IsPresent && Team != null; + //public override bool IsPresent => base.IsPresent && Team != null; + public override bool IsPresent => false; protected override void Update() {
public static readonly bool ENABLED
in osu.Game/Seasonal/SeasonalUIConfig.cs
. Change the value to true/false to enable/disable the Christmas effects.readonly
in the line mentioned aboveSeasonalUIConfig.ENABLED = true;
at the beginning of the method started by private void load(BeatmapListingOverlay beatmapListing
... in osu.Game/Screens/Menu/MainMenu.cs
, and add SeasonalUIConfig.ENABLED = false;
at the end of the method (it's quite long so be careful).osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
find a line with public BindableFloat Spacing { get; } = new BindableFloat(4f)
. The "4" in the last bracket is the default grid spacing. The range of allowed grid spacing can be controlled by the MinValue
and MaxValue
just below that line.MaxValue
to 512, then in the editor set the X and Y offset to 0, and the grid spacing to 512.result ??= Composer.TrySnapToDistanceGrid(movePosition, limitedDistanceSnap.Value ? referenceBlueprint.Item.StartTime : null);
in osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
. Change limitedDistanceSnap.Value ? referenceBlueprint.Item.StartTime : null
to referenceBlueprint.Item.StartTime
.LabelContainer.ResizeTo(new Vector2(12), 200, Easing.OutQuint);
in osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
. Change 12 to 0.LabelContainer.ResizeTo(new Vector2(Label.Width, 16), 200, Easing.OutQuint);
. Change Vector2(Label.Width, 16)
to Vector2(0)
.osu.Game/Database/RealmArchiveModelImporter.cs
find a line with string mountedPath =
, change the value after = to a string with the path you like.osu.Game/Screens/Edit/Compose/Components/BeatDivisorPresetCollection.cs
find a line with public static readonly BeatDivisorPresetCollection COMMON =
. There is a group of numbers like { 1, 2, 4, 8, 16 }
at the end of the line; change it to { 1, 2, 3, 4, 6, 8, 12, 16 }
. After this change some divisors would not display correctly in the top right box, but the functionality should not be affected../mapsetverifier --no-sandbox
./resources/app/api/linux-x64/MapsetVerifierBackendfor me it complains
No usable version of libssl was found
which can be solved by manually install openssl1.0. For ubuntu it can be downloaded from hereCouldn't find a valid ICU package installed on the system
, and the solution is to install libicu70; for ubuntu download at herelame --noreplaygain -b 192 filename.mp3
cjpeg
in static/tools
.cjpeg -quality 90 filename.png > filename.jpg
cjpeg -quality 90
is usually comparable with the original image. Larger file sizes means higher server cost and longer to download (not everyone can download at several M/s from osu)hitsound volume % 100 90 80 70 60 50 40 30 20 10 5 dB (100% as 0dB) 0 -1 -2 -3 -4.5 -6 -8 -10.5 -14 -20 -26ok I realized that the volume % is simply proportional to the amplitude lol