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

Merge branch 'master' into options-footer

Browse Source
This commit is contained in:
Thomas Müller
2017-03-06 20:01:51 +01:00
committed by GitHub
parent 1fdf865c88 2d7d499f3d
commit 6e9c4a4251
10 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
View File

@ -34,6 +34,7 @@ namespace osu.Game.Beatmaps.Drawables
new TextAwesome new TextAwesome
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = Size.X, TextSize = Size.X,
Colour = getColour(beatmap), Colour = getColour(beatmap),
Icon = FontAwesome.fa_circle Icon = FontAwesome.fa_circle
@ -41,6 +42,7 @@ namespace osu.Game.Beatmaps.Drawables
new TextAwesome new TextAwesome
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = Size.X, TextSize = Size.X,
Colour = Color4.White, Colour = Color4.White,
Icon = Ruleset.GetRuleset(beatmap.Mode).Icon Icon = Ruleset.GetRuleset(beatmap.Mode).Icon

5
osu.Game/Graphics/TextAwesome.cs
View File

@ -26,11 +26,6 @@ namespace osu.Game.Graphics
Text = ((char)icon).ToString(); Text = ((char)icon).ToString();
} }
} }
public TextAwesome()
{
Origin = Framework.Graphics.Anchor.Centre;
}
} }
public enum FontAwesome public enum FontAwesome

1
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
View File

@ -98,6 +98,7 @@ namespace osu.Game.Graphics.UserInterface
icon = new TextAwesome icon = new TextAwesome
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = 25, TextSize = 25,
}, },
} }

2
osu.Game/OsuGame.cs
View File

@ -192,7 +192,7 @@ namespace osu.Game
private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args) private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args)
{ {
if (args.Repeat) return false; if (args.Repeat || intro == null) return false;
switch (args.Key) switch (args.Key)
{ {

1
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -176,6 +176,7 @@ namespace osu.Game.Overlays.Notifications
new TextAwesome new TextAwesome
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = FontAwesome.fa_times_circle, Icon = FontAwesome.fa_times_circle,
} }
}; };

1
osu.Game/Overlays/Notifications/SimpleNotification.cs
View File

@ -51,6 +51,7 @@ namespace osu.Game.Overlays.Notifications
iconDrawable = new TextAwesome iconDrawable = new TextAwesome
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = icon, Icon = icon,
} }
}); });

4
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -134,7 +134,7 @@ namespace osu.Game.Overlays
foreach (var w in wavesContainer.Children) foreach (var w in wavesContainer.Children)
w.State = Visibility.Visible; w.State = Visibility.Visible;
contentContainer.FadeIn(APPEAR_DURATION, EasingTypes.OutQuint); FadeIn(100, EasingTypes.OutQuint);
contentContainer.MoveToY(0, APPEAR_DURATION, EasingTypes.OutQuint); contentContainer.MoveToY(0, APPEAR_DURATION, EasingTypes.OutQuint);
} }
@ -142,7 +142,7 @@ namespace osu.Game.Overlays
{ {
base.PopOut(); base.PopOut();
contentContainer.FadeOut(DISAPPEAR_DURATION, EasingTypes.In); FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint);
contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In); contentContainer.MoveToY(DrawHeight * 2f, DISAPPEAR_DURATION, EasingTypes.In);
foreach (var w in wavesContainer.Children) foreach (var w in wavesContainer.Children)

1
osu.Game/Screens/Menu/Button.cs
View File

@ -108,6 +108,7 @@ namespace osu.Game.Screens.Menu
{ {
Shadow = true, Shadow = true,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TextSize = 30, TextSize = 30,
Position = new Vector2(0, 0), Position = new Vector2(0, 0),
Icon = symbol Icon = symbol

2
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -209,12 +209,14 @@ namespace osu.Game.Screens.Select
new TextAwesome new TextAwesome
{ {
Icon = FontAwesome.fa_square, Icon = FontAwesome.fa_square,
Origin = Anchor.Centre,
Colour = new Color4(68, 17, 136, 255), Colour = new Color4(68, 17, 136, 255),
Rotation = 45 Rotation = 45
}, },
new TextAwesome new TextAwesome
{ {
Icon = statistic.Icon, Icon = statistic.Icon,
Origin = Anchor.Centre,
Colour = new Color4(255, 221, 85, 255), Colour = new Color4(255, 221, 85, 255),
Scale = new Vector2(0.8f) Scale = new Vector2(0.8f)
}, },

11
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -440,8 +440,19 @@ namespace osu.Game.Screens.Select
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{ {
if (args.Repeat) return false;
switch (args.Key) switch (args.Key)
{ {
case Key.F1:
modSelect.ToggleVisibility();
return true;
case Key.F2:
carousel.SelectRandom();
return true;
case Key.F3:
beatmapOptions.ToggleVisibility();
return true;
case Key.Enter: case Key.Enter:
footer.StartButton.TriggerClick(); footer.StartButton.TriggerClick();
return true; return true;