mirror of
https://github.com/osukey/osukey.git
synced 2025-06-09 21:37:59 +09:00
Fix clear identifier typos
This commit is contained in:
parent
55768d8c11
commit
98524d60a4
@ -76,7 +76,7 @@ namespace osu.Desktop.Security
|
|||||||
private void load(OsuColour colours, NotificationOverlay notificationOverlay)
|
private void load(OsuColour colours, NotificationOverlay notificationOverlay)
|
||||||
{
|
{
|
||||||
Icon = FontAwesome.Solid.ShieldAlt;
|
Icon = FontAwesome.Solid.ShieldAlt;
|
||||||
IconBackgound.Colour = colours.YellowDark;
|
IconBackground.Colour = colours.YellowDark;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -90,9 +90,9 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
|
|||||||
.ResizeTo(largeFaint.Size * new Vector2(5, 1), duration, Easing.OutQuint)
|
.ResizeTo(largeFaint.Size * new Vector2(5, 1), duration, Easing.OutQuint)
|
||||||
.FadeOut(duration * 2);
|
.FadeOut(duration * 2);
|
||||||
|
|
||||||
const float angle_variangle = 15; // should be less than 45
|
const float angle_variable = 15; // should be less than 45
|
||||||
directionalGlow1.Rotation = StatelessRNG.NextSingle(-angle_variangle, angle_variangle, randomSeed, 4);
|
directionalGlow1.Rotation = StatelessRNG.NextSingle(-angle_variable, angle_variable, randomSeed, 4);
|
||||||
directionalGlow2.Rotation = StatelessRNG.NextSingle(-angle_variangle, angle_variangle, randomSeed, 5);
|
directionalGlow2.Rotation = StatelessRNG.NextSingle(-angle_variable, angle_variable, randomSeed, 5);
|
||||||
|
|
||||||
this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out);
|
this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out);
|
||||||
}
|
}
|
||||||
|
@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mania.UI
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(IScrollingInfo scrollingInfo)
|
private void load(IScrollingInfo scrollingInfo)
|
||||||
{
|
{
|
||||||
const float angle_variangle = 15; // should be less than 45
|
const float angle_variable = 15; // should be less than 45
|
||||||
const float roundness = 80;
|
const float roundness = 80;
|
||||||
const float initial_height = 10;
|
const float initial_height = 10;
|
||||||
|
|
||||||
@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Mania.UI
|
|||||||
Masking = true,
|
Masking = true,
|
||||||
Size = new Vector2(0.01f, initial_height),
|
Size = new Vector2(0.01f, initial_height),
|
||||||
Blending = BlendingParameters.Additive,
|
Blending = BlendingParameters.Additive,
|
||||||
Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
|
Rotation = RNG.NextSingle(-angle_variable, angle_variable),
|
||||||
EdgeEffect = new EdgeEffectParameters
|
EdgeEffect = new EdgeEffectParameters
|
||||||
{
|
{
|
||||||
Type = EdgeEffectType.Glow,
|
Type = EdgeEffectType.Glow,
|
||||||
@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Mania.UI
|
|||||||
Masking = true,
|
Masking = true,
|
||||||
Size = new Vector2(0.01f, initial_height),
|
Size = new Vector2(0.01f, initial_height),
|
||||||
Blending = BlendingParameters.Additive,
|
Blending = BlendingParameters.Additive,
|
||||||
Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
|
Rotation = RNG.NextSingle(-angle_variable, angle_variable),
|
||||||
EdgeEffect = new EdgeEffectParameters
|
EdgeEffect = new EdgeEffectParameters
|
||||||
{
|
{
|
||||||
Type = EdgeEffectType.Glow,
|
Type = EdgeEffectType.Glow,
|
||||||
|
@ -34,20 +34,20 @@ namespace osu.Game.Tests.Mods
|
|||||||
var mod3 = new OsuModDoubleTime { SpeedChange = { Value = 1.26 } };
|
var mod3 = new OsuModDoubleTime { SpeedChange = { Value = 1.26 } };
|
||||||
|
|
||||||
var doubleConvertedMod1 = new APIMod(mod1).ToMod(ruleset);
|
var doubleConvertedMod1 = new APIMod(mod1).ToMod(ruleset);
|
||||||
var doulbeConvertedMod2 = new APIMod(mod2).ToMod(ruleset);
|
var doubleConvertedMod2 = new APIMod(mod2).ToMod(ruleset);
|
||||||
var doulbeConvertedMod3 = new APIMod(mod3).ToMod(ruleset);
|
var doubleConvertedMod3 = new APIMod(mod3).ToMod(ruleset);
|
||||||
|
|
||||||
Assert.That(mod1, Is.Not.EqualTo(mod2));
|
Assert.That(mod1, Is.Not.EqualTo(mod2));
|
||||||
Assert.That(doubleConvertedMod1, Is.Not.EqualTo(doulbeConvertedMod2));
|
Assert.That(doubleConvertedMod1, Is.Not.EqualTo(doubleConvertedMod2));
|
||||||
|
|
||||||
Assert.That(mod2, Is.EqualTo(mod2));
|
Assert.That(mod2, Is.EqualTo(mod2));
|
||||||
Assert.That(doulbeConvertedMod2, Is.EqualTo(doulbeConvertedMod2));
|
Assert.That(doubleConvertedMod2, Is.EqualTo(doubleConvertedMod2));
|
||||||
|
|
||||||
Assert.That(mod2, Is.EqualTo(mod3));
|
Assert.That(mod2, Is.EqualTo(mod3));
|
||||||
Assert.That(doulbeConvertedMod2, Is.EqualTo(doulbeConvertedMod3));
|
Assert.That(doubleConvertedMod2, Is.EqualTo(doubleConvertedMod3));
|
||||||
|
|
||||||
Assert.That(mod3, Is.EqualTo(mod2));
|
Assert.That(mod3, Is.EqualTo(mod2));
|
||||||
Assert.That(doulbeConvertedMod3, Is.EqualTo(doulbeConvertedMod2));
|
Assert.That(doubleConvertedMod3, Is.EqualTo(doubleConvertedMod2));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ namespace osu.Game.Tests.Online
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestSerialiseUnionFailsWithSingalR()
|
public void TestSerialiseUnionFailsWithSignalR()
|
||||||
{
|
{
|
||||||
var state = new TeamVersusUserState();
|
var state = new TeamVersusUserState();
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
visiblityAssert(true);
|
visibilityAssert(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
visiblityAssert(true);
|
visibilityAssert(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
visiblityAssert(true);
|
visibilityAssert(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -73,10 +73,10 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
visiblityAssert(false);
|
visibilityAssert(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void visiblityAssert(bool shown)
|
private void visibilityAssert(bool shown)
|
||||||
{
|
{
|
||||||
AddAssert($"is container {(shown ? "visible" : "hidden")}", () => container.Alpha == (shown ? 1 : 0));
|
AddAssert($"is container {(shown ? "visible" : "hidden")}", () => container.Alpha == (shown ? 1 : 0));
|
||||||
}
|
}
|
||||||
|
@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Playlists
|
|||||||
{
|
{
|
||||||
const string not_found_prefix = "beatmaps not found:";
|
const string not_found_prefix = "beatmaps not found:";
|
||||||
|
|
||||||
string errorMesage = null;
|
string errorMessage = null;
|
||||||
|
|
||||||
AddStep("setup", () =>
|
AddStep("setup", () =>
|
||||||
{
|
{
|
||||||
@ -96,9 +96,9 @@ namespace osu.Game.Tests.Visual.Playlists
|
|||||||
SelectedRoom.Value.Name.Value = "Test Room";
|
SelectedRoom.Value.Name.Value = "Test Room";
|
||||||
SelectedRoom.Value.Playlist.Add(new PlaylistItem { Beatmap = { Value = beatmap } });
|
SelectedRoom.Value.Playlist.Add(new PlaylistItem { Beatmap = { Value = beatmap } });
|
||||||
|
|
||||||
errorMesage = $"{not_found_prefix} {beatmap.OnlineID}";
|
errorMessage = $"{not_found_prefix} {beatmap.OnlineID}";
|
||||||
|
|
||||||
RoomManager.CreateRequested = _ => errorMesage;
|
RoomManager.CreateRequested = _ => errorMessage;
|
||||||
});
|
});
|
||||||
|
|
||||||
AddAssert("error not displayed", () => !settings.ErrorText.IsPresent);
|
AddAssert("error not displayed", () => !settings.ErrorText.IsPresent);
|
||||||
@ -107,7 +107,7 @@ namespace osu.Game.Tests.Visual.Playlists
|
|||||||
AddStep("create room", () => settings.ApplyButton.Action.Invoke());
|
AddStep("create room", () => settings.ApplyButton.Action.Invoke());
|
||||||
|
|
||||||
AddAssert("error displayed", () => settings.ErrorText.IsPresent);
|
AddAssert("error displayed", () => settings.ErrorText.IsPresent);
|
||||||
AddAssert("error has custom text", () => settings.ErrorText.Text != errorMesage);
|
AddAssert("error has custom text", () => settings.ErrorText.Text != errorMessage);
|
||||||
AddAssert("playlist item marked invalid", () => !SelectedRoom.Value.Playlist[0].Valid.Value);
|
AddAssert("playlist item marked invalid", () => !SelectedRoom.Value.Playlist[0].Valid.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,8 +7,8 @@ namespace osu.Game.Online.API
|
|||||||
{
|
{
|
||||||
public class APIException : InvalidOperationException
|
public class APIException : InvalidOperationException
|
||||||
{
|
{
|
||||||
public APIException(string messsage, Exception innerException)
|
public APIException(string message, Exception innerException)
|
||||||
: base(messsage, innerException)
|
: base(message, innerException)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -335,7 +335,7 @@ namespace osu.Game.Online.Chat
|
|||||||
/// right now it caps out at 50 messages and therefore only returns one channel's worth of content.
|
/// right now it caps out at 50 messages and therefore only returns one channel's worth of content.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="channel">The channel </param>
|
/// <param name="channel">The channel </param>
|
||||||
private void fetchInitalMessages(Channel channel)
|
private void fetchInitialMessages(Channel channel)
|
||||||
{
|
{
|
||||||
if (channel.Id <= 0 || channel.MessagesLoaded) return;
|
if (channel.Id <= 0 || channel.MessagesLoaded) return;
|
||||||
|
|
||||||
@ -441,7 +441,7 @@ namespace osu.Game.Online.Chat
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (fetchInitialMessages)
|
if (fetchInitialMessages)
|
||||||
fetchInitalMessages(channel);
|
this.fetchInitialMessages(channel);
|
||||||
}
|
}
|
||||||
|
|
||||||
CurrentChannel.Value ??= channel;
|
CurrentChannel.Value ??= channel;
|
||||||
|
@ -170,7 +170,7 @@ namespace osu.Game.Online.Chat
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OsuColour colours, ChatOverlay chatOverlay, NotificationOverlay notificationOverlay, ChannelManager channelManager)
|
private void load(OsuColour colours, ChatOverlay chatOverlay, NotificationOverlay notificationOverlay, ChannelManager channelManager)
|
||||||
{
|
{
|
||||||
IconBackgound.Colour = colours.PurpleDark;
|
IconBackground.Colour = colours.PurpleDark;
|
||||||
|
|
||||||
Activated = delegate
|
Activated = delegate
|
||||||
{
|
{
|
||||||
|
@ -362,15 +362,15 @@ namespace osu.Game.Overlays.Comments
|
|||||||
|
|
||||||
private void updateButtonsState()
|
private void updateButtonsState()
|
||||||
{
|
{
|
||||||
int loadedReplesCount = loadedReplies.Count;
|
int loadedRepliesCount = loadedReplies.Count;
|
||||||
bool hasUnloadedReplies = loadedReplesCount != Comment.RepliesCount;
|
bool hasUnloadedReplies = loadedRepliesCount != Comment.RepliesCount;
|
||||||
|
|
||||||
loadRepliesButton.FadeTo(hasUnloadedReplies && loadedReplesCount == 0 ? 1 : 0);
|
loadRepliesButton.FadeTo(hasUnloadedReplies && loadedRepliesCount == 0 ? 1 : 0);
|
||||||
showMoreButton.FadeTo(hasUnloadedReplies && loadedReplesCount > 0 ? 1 : 0);
|
showMoreButton.FadeTo(hasUnloadedReplies && loadedRepliesCount > 0 ? 1 : 0);
|
||||||
showRepliesButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
|
showRepliesButton.FadeTo(loadedRepliesCount != 0 ? 1 : 0);
|
||||||
|
|
||||||
if (Comment.IsTopLevel)
|
if (Comment.IsTopLevel)
|
||||||
chevronButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
|
chevronButton.FadeTo(loadedRepliesCount != 0 ? 1 : 0);
|
||||||
|
|
||||||
showMoreButton.IsLoading = loadRepliesButton.IsLoading = false;
|
showMoreButton.IsLoading = loadRepliesButton.IsLoading = false;
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Notifications
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OsuColour colours)
|
private void load(OsuColour colours)
|
||||||
{
|
{
|
||||||
IconBackgound.Colour = ColourInfo.GradientVertical(colours.GreenDark, colours.GreenLight);
|
IconBackground.Colour = ColourInfo.GradientVertical(colours.GreenDark, colours.GreenLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,13 +43,13 @@ namespace osu.Game.Overlays.Notifications
|
|||||||
private readonly TextFlowContainer textDrawable;
|
private readonly TextFlowContainer textDrawable;
|
||||||
private readonly SpriteIcon iconDrawable;
|
private readonly SpriteIcon iconDrawable;
|
||||||
|
|
||||||
protected Box IconBackgound;
|
protected Box IconBackground;
|
||||||
|
|
||||||
public SimpleNotification()
|
public SimpleNotification()
|
||||||
{
|
{
|
||||||
IconContent.AddRange(new Drawable[]
|
IconContent.AddRange(new Drawable[]
|
||||||
{
|
{
|
||||||
IconBackgound = new Box
|
IconBackground = new Box
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.6f))
|
Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.6f))
|
||||||
|
@ -49,7 +49,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
|
|||||||
{
|
{
|
||||||
TriggerOperationStarted();
|
TriggerOperationStarted();
|
||||||
Action?.Invoke();
|
Action?.Invoke();
|
||||||
TriggerOperatoinEnded();
|
TriggerOperationEnded();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,6 +92,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
|
|||||||
|
|
||||||
protected void TriggerOperationStarted() => OperationStarted?.Invoke();
|
protected void TriggerOperationStarted() => OperationStarted?.Invoke();
|
||||||
|
|
||||||
protected void TriggerOperatoinEnded() => OperationEnded?.Invoke();
|
protected void TriggerOperationEnded() => OperationEnded?.Invoke();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
|
|||||||
|
|
||||||
protected override void OnDragEnd(DragEndEvent e)
|
protected override void OnDragEnd(DragEndEvent e)
|
||||||
{
|
{
|
||||||
TriggerOperatoinEnded();
|
TriggerOperationEnded();
|
||||||
|
|
||||||
UpdateHoverState();
|
UpdateHoverState();
|
||||||
base.OnDragEnd(e);
|
base.OnDragEnd(e);
|
||||||
|
@ -53,7 +53,7 @@ namespace osu.Game.Screens.Menu
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// How much should each bar go down each millisecond (based on a full bar).
|
/// How much should each bar go down each millisecond (based on a full bar).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private const float decay_per_milisecond = 0.0024f;
|
private const float decay_per_millisecond = 0.0024f;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Number of milliseconds between each amplitude update.
|
/// Number of milliseconds between each amplitude update.
|
||||||
@ -136,7 +136,7 @@ namespace osu.Game.Screens.Menu
|
|||||||
{
|
{
|
||||||
base.Update();
|
base.Update();
|
||||||
|
|
||||||
float decayFactor = (float)Time.Elapsed * decay_per_milisecond;
|
float decayFactor = (float)Time.Elapsed * decay_per_millisecond;
|
||||||
|
|
||||||
for (int i = 0; i < bars_per_visualiser; i++)
|
for (int i = 0; i < bars_per_visualiser; i++)
|
||||||
{
|
{
|
||||||
|
@ -496,7 +496,7 @@ namespace osu.Game.Screens.Play
|
|||||||
private void load(OsuColour colours, AudioManager audioManager, NotificationOverlay notificationOverlay, VolumeOverlay volumeOverlay)
|
private void load(OsuColour colours, AudioManager audioManager, NotificationOverlay notificationOverlay, VolumeOverlay volumeOverlay)
|
||||||
{
|
{
|
||||||
Icon = FontAwesome.Solid.VolumeMute;
|
Icon = FontAwesome.Solid.VolumeMute;
|
||||||
IconBackgound.Colour = colours.RedDark;
|
IconBackground.Colour = colours.RedDark;
|
||||||
|
|
||||||
Activated = delegate
|
Activated = delegate
|
||||||
{
|
{
|
||||||
@ -548,7 +548,7 @@ namespace osu.Game.Screens.Play
|
|||||||
private void load(OsuColour colours, NotificationOverlay notificationOverlay)
|
private void load(OsuColour colours, NotificationOverlay notificationOverlay)
|
||||||
{
|
{
|
||||||
Icon = FontAwesome.Solid.BatteryQuarter;
|
Icon = FontAwesome.Solid.BatteryQuarter;
|
||||||
IconBackgound.Colour = colours.RedDark;
|
IconBackground.Colour = colours.RedDark;
|
||||||
|
|
||||||
Activated = delegate
|
Activated = delegate
|
||||||
{
|
{
|
||||||
|
@ -97,7 +97,7 @@ namespace osu.Game.Updater
|
|||||||
private void load(OsuColour colours, ChangelogOverlay changelog, NotificationOverlay notificationOverlay)
|
private void load(OsuColour colours, ChangelogOverlay changelog, NotificationOverlay notificationOverlay)
|
||||||
{
|
{
|
||||||
Icon = FontAwesome.Solid.CheckSquare;
|
Icon = FontAwesome.Solid.CheckSquare;
|
||||||
IconBackgound.Colour = colours.BlueDark;
|
IconBackground.Colour = colours.BlueDark;
|
||||||
|
|
||||||
Activated = delegate
|
Activated = delegate
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user