From 23111821f594fdf79660cffe0173056d996a505c Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 4 Sep 2016 16:15:35 +0900 Subject: [PATCH 1/4] Update naming conventions. --- osu.Game/GameModes/Menu/ButtonSystem.cs | 12 ++++++------ osu.Game/GameModes/Menu/MainMenu.cs | 2 +- osu.Game/Graphics/UserInterface/TextBox.cs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index f140b0f247..f2008d0fc0 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -477,7 +477,7 @@ namespace osu.Game.GameModes.Menu icon.RotateTo(10, offset, EasingTypes.InOutSine); icon.ScaleTo(new Vector2(1, 0.9f), offset, EasingTypes.Out); - icon.Transformations.Add(new TransformRotation(Clock) + icon.Transforms.Add(new TransformRotation(Clock) { StartValue = -10, EndValue = 10, @@ -488,7 +488,7 @@ namespace osu.Game.GameModes.Menu LoopDelay = duration * 2 }); - icon.Transformations.Add(new TransformPosition(Clock) + icon.Transforms.Add(new TransformPosition(Clock) { StartValue = Vector2.Zero, EndValue = new Vector2(0, -10), @@ -499,7 +499,7 @@ namespace osu.Game.GameModes.Menu LoopDelay = duration }); - icon.Transformations.Add(new TransformScaleVector(Clock) + icon.Transforms.Add(new TransformScaleVector(Clock) { StartValue = new Vector2(1, 0.9f), EndValue = Vector2.One, @@ -510,7 +510,7 @@ namespace osu.Game.GameModes.Menu LoopDelay = duration }); - icon.Transformations.Add(new TransformPosition(Clock) + icon.Transforms.Add(new TransformPosition(Clock) { StartValue = new Vector2(0, -10), EndValue = Vector2.Zero, @@ -521,7 +521,7 @@ namespace osu.Game.GameModes.Menu LoopDelay = duration }); - icon.Transformations.Add(new TransformScaleVector(Clock) + icon.Transforms.Add(new TransformScaleVector(Clock) { StartValue = Vector2.One, EndValue = new Vector2(1, 0.9f), @@ -532,7 +532,7 @@ namespace osu.Game.GameModes.Menu LoopDelay = duration }); - icon.Transformations.Add(new TransformRotation(Clock) + icon.Transforms.Add(new TransformRotation(Clock) { StartValue = 10, EndValue = -10, diff --git a/osu.Game/GameModes/Menu/MainMenu.cs b/osu.Game/GameModes/Menu/MainMenu.cs index 3cbad3ae78..e9bb8c5c5c 100644 --- a/osu.Game/GameModes/Menu/MainMenu.cs +++ b/osu.Game/GameModes/Menu/MainMenu.cs @@ -21,7 +21,7 @@ namespace osu.Game.GameModes.Menu base.Load(); AudioSample welcome = Game.Audio.Sample.Get(@"welcome"); - welcome.Play(); + //welcome.Play(); Add(new ButtonSystem()); diff --git a/osu.Game/Graphics/UserInterface/TextBox.cs b/osu.Game/Graphics/UserInterface/TextBox.cs index af2bd06184..a9551a10c0 100644 --- a/osu.Game/Graphics/UserInterface/TextBox.cs +++ b/osu.Game/Graphics/UserInterface/TextBox.cs @@ -143,7 +143,7 @@ namespace osu.Game.Graphics.UserInterface { cursor.FadeTo(0.5f, 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, EndValue = 0.2f, From 7254c31a92bf7e9399e6cd2341e581dabb0bf584 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 4 Sep 2016 17:42:15 +0900 Subject: [PATCH 2/4] Drawable is abstract, let's not instantiate it. --- osu.Game/GameModes/Menu/ButtonSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index f2008d0fc0..897c1655d4 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -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)); //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(@"multi", @"multiplayer", FontAwesome.users, new Color4(94, 63, 186, 255), onMulti, 0, Key.M))); From 49a0e3d9acda68a7fa07c55a05d553558bfd47db Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 4 Sep 2016 18:29:26 +0900 Subject: [PATCH 3/4] Framework namespace rename. --- osu.Desktop/Program.cs | 2 +- osu.Game/OsuGame.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs index 5144ce4076..3f745f3b84 100644 --- a/osu.Desktop/Program.cs +++ b/osu.Desktop/Program.cs @@ -3,7 +3,7 @@ using System; using osu.Framework.Desktop; -using osu.Framework.Framework; +using osu.Framework.OS; using osu.Game; namespace osu.Desktop diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index c72fb00bb0..c77e4f5c70 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using osu.Framework.Framework; using osu.Game.Configuration; using osu.Game.GameModes.Menu; using osu.Game.Graphics.Cursor; From 8295c6b732e4d18f68570a55cf88c820b1b6ea16 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 4 Sep 2016 18:38:51 +0900 Subject: [PATCH 4/4] Update framework reference. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index e33e9158a9..6d7de567f9 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit e33e9158a96f0dd72f5c6d94b3778d28e98598da +Subproject commit 6d7de567f99447c90499f2d9442a202aea534ebc