h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 05:32:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #22 from peppy/general-fixes

Browse Source 
General fixes.
This commit is contained in:
Dan Balasescu 2016-09-04 19:09:54 +09:30 committed by GitHub
commit 8e96a99ac5
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit e33e9158a96f0dd72f5c6d94b3778d28e98598da Subproject commit 6d7de567f99447c90499f2d9442a202aea534ebc

2
osu.Desktop/Program.cs
View File

@ -3,7 +3,7 @@
using System; using System;
using osu.Framework.Desktop; using osu.Framework.Desktop;
using osu.Framework.Framework; using osu.Framework.OS;
using osu.Game; using osu.Game;
namespace osu.Desktop namespace osu.Desktop

14
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.GameModes.Menu
buttonFlow.Add(backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -wedge_width, Key.Escape)); buttonFlow.Add(backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -wedge_width, Key.Escape));
//need a container to make the osu! icon flow properly. //need a container to make the osu! icon flow properly.
buttonFlow.Add(iconFacade = new Drawable() { Size = new Vector2(0, button_area_height) }); buttonFlow.Add(iconFacade = new Container() { Size = new Vector2(0, button_area_height) });
buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"solo", @"freeplay", FontAwesome.user, new Color4(102, 68, 204, 255), onSolo, wedge_width, Key.P))); buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"solo", @"freeplay", FontAwesome.user, new Color4(102, 68, 204, 255), onSolo, wedge_width, Key.P)));
buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), onMulti, 0, Key.M))); buttonsPlay.Add((Button)buttonFlow.Add(new Button(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), onMulti, 0, Key.M)));
@ -477,7 +477,7 @@ namespace osu.Game.GameModes.Menu
icon.RotateTo(10, offset, EasingTypes.InOutSine); icon.RotateTo(10, offset, EasingTypes.InOutSine);
icon.ScaleTo(new Vector2(1, 0.9f), offset, EasingTypes.Out); icon.ScaleTo(new Vector2(1, 0.9f), offset, EasingTypes.Out);
icon.Transformations.Add(new TransformRotation(Clock) icon.Transforms.Add(new TransformRotation(Clock)
{ {
StartValue = -10, StartValue = -10,
EndValue = 10, EndValue = 10,
@ -488,7 +488,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration * 2 LoopDelay = duration * 2
}); });
icon.Transformations.Add(new TransformPosition(Clock) icon.Transforms.Add(new TransformPosition(Clock)
{ {
StartValue = Vector2.Zero, StartValue = Vector2.Zero,
EndValue = new Vector2(0, -10), EndValue = new Vector2(0, -10),
@ -499,7 +499,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration LoopDelay = duration
}); });
icon.Transformations.Add(new TransformScaleVector(Clock) icon.Transforms.Add(new TransformScaleVector(Clock)
{ {
StartValue = new Vector2(1, 0.9f), StartValue = new Vector2(1, 0.9f),
EndValue = Vector2.One, EndValue = Vector2.One,
@ -510,7 +510,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration LoopDelay = duration
}); });
icon.Transformations.Add(new TransformPosition(Clock) icon.Transforms.Add(new TransformPosition(Clock)
{ {
StartValue = new Vector2(0, -10), StartValue = new Vector2(0, -10),
EndValue = Vector2.Zero, EndValue = Vector2.Zero,
@ -521,7 +521,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration LoopDelay = duration
}); });
icon.Transformations.Add(new TransformScaleVector(Clock) icon.Transforms.Add(new TransformScaleVector(Clock)
{ {
StartValue = Vector2.One, StartValue = Vector2.One,
EndValue = new Vector2(1, 0.9f), EndValue = new Vector2(1, 0.9f),
@ -532,7 +532,7 @@ namespace osu.Game.GameModes.Menu
LoopDelay = duration LoopDelay = duration
}); });
icon.Transformations.Add(new TransformRotation(Clock) icon.Transforms.Add(new TransformRotation(Clock)
{ {
StartValue = 10, StartValue = 10,
EndValue = -10, EndValue = -10,

2
osu.Game/GameModes/Menu/MainMenu.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.GameModes.Menu
base.Load(); base.Load();
AudioSample welcome = Game.Audio.Sample.Get(@"welcome"); AudioSample welcome = Game.Audio.Sample.Get(@"welcome");
welcome.Play(); //welcome.Play();
Add(new ButtonSystem()); Add(new ButtonSystem());

2
osu.Game/Graphics/UserInterface/TextBox.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
cursor.FadeTo(0.5f, 200, EasingTypes.Out); cursor.FadeTo(0.5f, 200, EasingTypes.Out);
cursor.FadeColour(Color4.White, 200, EasingTypes.Out); cursor.FadeColour(Color4.White, 200, EasingTypes.Out);
cursor.Transformations.Add(new TransformAlpha(Clock) cursor.Transforms.Add(new TransformAlpha(Clock)
{ {
StartValue = 0.5f, StartValue = 0.5f,
EndValue = 0.2f, EndValue = 0.2f,

1
osu.Game/OsuGame.cs
View File

@ -3,7 +3,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Framework;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.GameModes.Menu; using osu.Game.GameModes.Menu;
using osu.Game.Graphics.Cursor; using osu.Game.Graphics.Cursor;