From d291103d22e26f68d4c65e28d5c234412ed0be1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 5 Feb 2017 16:34:47 +0100 Subject: [PATCH 01/46] Avoid triangle bleeding by masking the triangle container without smoothness. --- osu.Game/Overlays/Pause/PauseButton.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/osu.Game/Overlays/Pause/PauseButton.cs b/osu.Game/Overlays/Pause/PauseButton.cs index bb707a70b1..3a6e20c4d9 100644 --- a/osu.Game/Overlays/Pause/PauseButton.cs +++ b/osu.Game/Overlays/Pause/PauseButton.cs @@ -203,13 +203,22 @@ namespace osu.Game.Overlays.Pause EdgeSmoothness = new Vector2(2, 0), RelativeSizeAxes = Axes.Both }, - new Triangles + new Container { RelativeSizeAxes = Axes.Both, - TriangleScale = 4, - ColourDark = OsuColour.Gray(0.88f), - Shear = new Vector2(-0.2f, 0) - } + Masking = true, + MaskingSmoothness = 0, + Children = new[] + { + new Triangles + { + RelativeSizeAxes = Axes.Both, + TriangleScale = 4, + ColourDark = OsuColour.Gray(0.88f), + Shear = new Vector2(-0.2f, 0) + } + } + }, } } } From c56478e1543e4855118b301c52c22c06b909ea18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 5 Feb 2017 20:16:40 +0100 Subject: [PATCH 02/46] Add missing license header. --- osu.Game/Overlays/Pause/PauseButton.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osu.Game/Overlays/Pause/PauseButton.cs b/osu.Game/Overlays/Pause/PauseButton.cs index 3a6e20c4d9..4da08c99d1 100644 --- a/osu.Game/Overlays/Pause/PauseButton.cs +++ b/osu.Game/Overlays/Pause/PauseButton.cs @@ -1,4 +1,8 @@ using OpenTK; +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using OpenTK; using OpenTK.Graphics; using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; From 0f72ef7dc2c900dceb1c0d0ee0bce596c2ea8beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 5 Feb 2017 20:17:02 +0100 Subject: [PATCH 03/46] Make pause buttons OnClick and not OnMouseDown. --- osu.Game/Overlays/Pause/PauseButton.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/osu.Game/Overlays/Pause/PauseButton.cs b/osu.Game/Overlays/Pause/PauseButton.cs index 4da08c99d1..cfbd933cec 100644 --- a/osu.Game/Overlays/Pause/PauseButton.cs +++ b/osu.Game/Overlays/Pause/PauseButton.cs @@ -1,4 +1,3 @@ -using OpenTK; //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE @@ -65,7 +64,7 @@ namespace osu.Game.Overlays.Pause public override bool Contains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos); - protected override bool OnMouseDown(Framework.Input.InputState state, MouseDownEventArgs args) + protected override bool OnClick(Framework.Input.InputState state) { didClick = true; colourContainer.ResizeTo(new Vector2(1.5f, 1f), clickDuration, EasingTypes.In); @@ -83,8 +82,6 @@ namespace osu.Game.Overlays.Pause return true; } - protected override bool OnClick(Framework.Input.InputState state) => false; - protected override bool OnHover(Framework.Input.InputState state) { colourContainer.ResizeTo(new Vector2(hoverWidth, 1f), hoverDuration, EasingTypes.OutElastic); From 91f09512555d76a7f9667ad73849709746606238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sun, 5 Feb 2017 20:17:29 +0100 Subject: [PATCH 04/46] Handle OnMouseDown in PauseOverlay such that players can not click circles through the overlay while paused. --- osu.Game/Overlays/Pause/PauseOverlay.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osu.Game/Overlays/Pause/PauseOverlay.cs b/osu.Game/Overlays/Pause/PauseOverlay.cs index 3cf514b7c8..8bf11f98be 100644 --- a/osu.Game/Overlays/Pause/PauseOverlay.cs +++ b/osu.Game/Overlays/Pause/PauseOverlay.cs @@ -69,6 +69,9 @@ namespace osu.Game.Overlays.Pause protected override void PopIn() => FadeIn(transition_duration, EasingTypes.In); protected override void PopOut() => FadeOut(transition_duration, EasingTypes.In); + // Don't let mouse down events through the overlay or people can click circles while paused. + protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true; + protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) { if (args.Key == Key.Escape) From 26c051350cb78432ac53cdf4506ff7ec11b19ba8 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 6 Feb 2017 18:42:12 +0900 Subject: [PATCH 05/46] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index f4362fce5a..6c9be31f19 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit f4362fce5a891e8b8dd84fadc0a9743a8c92e030 +Subproject commit 6c9be31f1928436d92b8880c16bb9ffe3b550991 From a5e3586c48ad87831bb904ea0acc84722a29c615 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 6 Feb 2017 20:46:36 +0900 Subject: [PATCH 06/46] Bump framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 6c9be31f19..efea7a17d8 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 6c9be31f1928436d92b8880c16bb9ffe3b550991 +Subproject commit efea7a17d84bc284629bcca9140d07c02223371c From 86205c35a41110bdc7c5513bd30089e1820dbd3b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 6 Feb 2017 20:46:53 +0900 Subject: [PATCH 07/46] Fix weird state changes of footer buttons. --- osu.Game/Screens/Select/FooterButton.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs index bf592396bb..365b043d3b 100644 --- a/osu.Game/Screens/Select/FooterButton.cs +++ b/osu.Game/Screens/Select/FooterButton.cs @@ -97,7 +97,6 @@ namespace osu.Game.Screens.Select HoverLost?.Invoke(); light.ScaleTo(new Vector2(1, 1), Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); light.FadeColour(DeselectedColour, Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); - box.FadeOut(Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); } protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) @@ -106,6 +105,12 @@ namespace osu.Game.Screens.Select return base.OnMouseDown(state, args); } + protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) + { + box.FadeOut(Footer.TRANSITION_LENGTH, EasingTypes.OutQuint); + return base.OnMouseUp(state, args); + } + protected override bool OnClick(InputState state) { box.ClearTransformations(); From 9b9ed32245e2f7a22d8d3593b2f6056b9b3b7f5f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 6 Feb 2017 22:17:29 +0900 Subject: [PATCH 08/46] Remove all @2x references, updates resource and framework. --- osu-framework | 2 +- osu-resources | 2 +- .../Objects/Drawables/DrawableHitCircle.cs | 4 +-- .../Objects/Drawables/DrawableSlider.cs | 2 +- .../Drawables/Pieces/ApproachCircle.cs | 2 +- .../Objects/Drawables/Pieces/CirclePiece.cs | 6 ++--- .../Objects/Drawables/Pieces/ExplodePiece.cs | 2 +- .../Objects/Drawables/Pieces/FlashPiece.cs | 2 +- .../Objects/Drawables/Pieces/GlowPiece.cs | 2 +- .../Objects/Drawables/Pieces/NumberPiece.cs | 2 +- .../Objects/Drawables/Pieces/RingPiece.cs | 25 +++++++++++-------- .../Objects/Drawables/Pieces/SliderBall.cs | 4 +-- .../Objects/Drawables/Pieces/SliderBody.cs | 2 +- osu.Game/Graphics/Cursor/CursorTrail.cs | 1 + osu.Game/OsuGameBase.cs | 2 +- .../Overlays/Toolbar/ToolbarUserButton.cs | 2 +- osu.Game/Screens/Menu/OsuLogo.cs | 6 ++--- 17 files changed, 35 insertions(+), 33 deletions(-) diff --git a/osu-framework b/osu-framework index efea7a17d8..d1d1313728 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit efea7a17d84bc284629bcca9140d07c02223371c +Subproject commit d1d13137283691df0c00ace712cbe212545e0041 diff --git a/osu-resources b/osu-resources index 7c42cf0a56..c03414fd4e 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 7c42cf0a565ca125edcf335fabcb2ba3961d202d +Subproject commit c03414fd4e9ffd99ab5641ac9a15ee21f3976b55 diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs index 5143bd4af8..dab9aa1144 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs @@ -105,7 +105,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables //sane defaults ring.Alpha = circle.Alpha = number.Alpha = glow.Alpha = 1; ApproachCircle.Alpha = 0; - ApproachCircle.Scale = new Vector2(2); + ApproachCircle.Scale = new Vector2(4); explode.Alpha = 0; } @@ -114,7 +114,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables base.UpdatePreemptState(); ApproachCircle.FadeIn(Math.Min(TIME_FADEIN * 2, TIME_PREEMPT)); - ApproachCircle.ScaleTo(0.6f, TIME_PREEMPT); + ApproachCircle.ScaleTo(1.1f, TIME_PREEMPT); } protected override void UpdateState(ArmedState state) diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs index ee8acf74c8..0626873afc 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs @@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables body = new SliderBody(s) { Position = s.Position, - PathWidth = s.Scale * 72, + PathWidth = s.Scale * 64, }, bouncer1 = new SliderBouncer(s, false) { diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs index 356a6c1c35..0e2ec50d89 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs @@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces [BackgroundDependencyLoader] private void load(TextureStore textures) { - approachCircle.Texture = textures.Get(@"Play/osu/approachcircle@2x"); + approachCircle.Texture = textures.Get(@"Play/osu/approachcircle"); } } } \ No newline at end of file diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs index 7cfd0d43ab..f28b4ba7eb 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs @@ -22,9 +22,9 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces public CirclePiece() { - Size = new Vector2(144); + Size = new Vector2(128); Masking = true; - CornerRadius = DrawSize.X / 2; + CornerRadius = Size.X / 2; Anchor = Anchor.Centre; Origin = Anchor.Centre; @@ -47,7 +47,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces [BackgroundDependencyLoader] private void load(TextureStore textures) { - disc.Texture = textures.Get(@"Play/osu/disc@2x"); + disc.Texture = textures.Get(@"Play/osu/disc"); } protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs index 6f9e2a979a..0b7d30cafc 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs @@ -11,7 +11,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces { public ExplodePiece() { - Size = new Vector2(144); + Size = new Vector2(128); Anchor = Anchor.Centre; Origin = Anchor.Centre; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs index 7ae3306be7..a4d69de4eb 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs @@ -12,7 +12,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces { public FlashPiece() { - Size = new Vector2(144); + Size = new Vector2(128); Masking = true; CornerRadius = Size.X / 2; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs index a9e1c9c369..569deb8ce6 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs @@ -33,7 +33,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces [BackgroundDependencyLoader] private void load(TextureStore textures) { - layer.Texture = textures.Get(@"Play/osu/ring-glow@2x"); + layer.Texture = textures.Get(@"Play/osu/ring-glow"); } } } \ No newline at end of file diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs index 0c5d2e9186..6478027335 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs @@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces [BackgroundDependencyLoader] private void load(TextureStore textures) { - number.Texture = textures.Get(@"Play/osu/number@2x"); + number.Texture = textures.Get(@"Play/osu/number"); } } } \ No newline at end of file diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs index c5fdbbfdfb..379c384144 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs @@ -6,32 +6,35 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; +using OpenTK; +using OpenTK.Graphics; namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces { public class RingPiece : Container { - private Sprite ring; - public RingPiece() { + Size = new Vector2(128); + + Masking = true; + CornerRadius = Size.X / 2; + Anchor = Anchor.Centre; Origin = Anchor.Centre; + BorderThickness = 10; + BorderColour = Color4.White; + Children = new Drawable[] { - ring = new Sprite + new Box { - Anchor = Anchor.Centre, - Origin = Anchor.Centre + AlwaysPresent = true, + Alpha = 0, + RelativeSizeAxes = Axes.Both } }; } - - [BackgroundDependencyLoader] - private void load(TextureStore textures) - { - ring.Texture = textures.Get(@"Play/osu/ring@2x"); - } } } \ No newline at end of file diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs index 0df80984bb..caae9b11f2 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs @@ -16,7 +16,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces private readonly Slider slider; private Box follow; - const float width = 140; + const float width = 128; public SliderBall(Slider slider) { @@ -45,7 +45,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces AutoSizeAxes = Axes.Both, Origin = Anchor.Centre, Anchor = Anchor.Centre, - BorderThickness = 14, + BorderThickness = 10, BorderColour = Color4.White, Alpha = 1, CornerRadius = width / 2, diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs index c0bd29bc02..2849976c09 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs @@ -89,7 +89,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces var bytes = upload.Data; const float aa_portion = 0.02f; - const float border_portion = 0.18f; + const float border_portion = 0.128f; const float gradient_portion = 1 - border_portion; const float opacity_at_centre = 0.3f; diff --git a/osu.Game/Graphics/Cursor/CursorTrail.cs b/osu.Game/Graphics/Cursor/CursorTrail.cs index f2060bf8a3..935895ed65 100644 --- a/osu.Game/Graphics/Cursor/CursorTrail.cs +++ b/osu.Game/Graphics/Cursor/CursorTrail.cs @@ -74,6 +74,7 @@ namespace osu.Game.Graphics.Cursor { shader = shaders?.Load(@"CursorTrail", FragmentShaderDescriptor.Texture); texture = textures.Get(@"Cursor/cursortrail"); + Scale = new Vector2(1 / texture.ScaleAdjust); } protected override void Update() diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index 31cee2ed39..f3b869c39a 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -45,7 +45,7 @@ namespace osu.Game Dependencies.Cache(new OsuColour()); //this completely overrides the framework default. will need to change once we make a proper FontStore. - Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 0.01f }, true); + Dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 }, true); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont")); diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs index d1af30e88d..b6b66ffb7e 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs @@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Toolbar { this.game = game; - guestTexture = textures.Get(@"Online/avatar-guest@2x"); + guestTexture = textures.Get(@"Online/avatar-guest"); } public int UserId diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs index af552c6bb6..d66c42ee4f 100644 --- a/osu.Game/Screens/Menu/OsuLogo.cs +++ b/osu.Game/Screens/Menu/OsuLogo.cs @@ -132,7 +132,6 @@ namespace osu.Game.Screens.Menu { Anchor = Anchor.Centre, Origin = Anchor.Centre, - Scale = new Vector2(0.5f), }, } }, @@ -147,7 +146,6 @@ namespace osu.Game.Screens.Menu Anchor = Anchor.Centre, Origin = Anchor.Centre, BlendingMode = BlendingMode.Additive, - Scale = new Vector2(0.5f), Alpha = 0.15f } } @@ -170,8 +168,8 @@ namespace osu.Game.Screens.Menu [BackgroundDependencyLoader] private void load(TextureStore textures) { - logo.Texture = textures.Get(@"Menu/logo@2x"); - ripple.Texture = textures.Get(@"Menu/logo@2x"); + logo.Texture = textures.Get(@"Menu/logo"); + ripple.Texture = textures.Get(@"Menu/logo"); } protected override void LoadComplete() From ea384b5efcbaa8025a891f463136a620d20d8e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 6 Feb 2017 19:07:39 +0100 Subject: [PATCH 09/46] Bump framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index d1d1313728..5906ae1e16 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit d1d13137283691df0c00ace712cbe212545e0041 +Subproject commit 5906ae1e16802fd4e04a6e9ceefdbd1a95de8b9e From c222ce44039f1cc6f2ec20fdef26d55c244bdd8d Mon Sep 17 00:00:00 2001 From: Danil Yarancev Date: Mon, 6 Feb 2017 21:19:27 +0300 Subject: [PATCH 10/46] Fix name --- .../Overlays/Options/{OptionDropdown.cs => OptionDropDown.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename osu.Game/Overlays/Options/{OptionDropdown.cs => OptionDropDown.cs} (100%) diff --git a/osu.Game/Overlays/Options/OptionDropdown.cs b/osu.Game/Overlays/Options/OptionDropDown.cs similarity index 100% rename from osu.Game/Overlays/Options/OptionDropdown.cs rename to osu.Game/Overlays/Options/OptionDropDown.cs From db8e44c7156b877ada0458b66fd8c17f91d3bf23 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 7 Feb 2017 11:15:37 +0900 Subject: [PATCH 11/46] Smooth triangles a bit (to avoid whole pixel jumps). --- osu.Game/Graphics/Backgrounds/Triangles.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs index 80b5a7a16e..664889181d 100644 --- a/osu.Game/Graphics/Backgrounds/Triangles.cs +++ b/osu.Game/Graphics/Backgrounds/Triangles.cs @@ -76,6 +76,7 @@ namespace osu.Game.Graphics.Backgrounds Origin = Anchor.TopCentre, RelativePositionAxes = Axes.Both, Scale = new Vector2(scale), + EdgeSmoothness = new Vector2(1), // Scaling height by 0.866 results in equiangular triangles (== 60° and equal side length) Colour = GetTriangleShade(), Size = new Vector2(size, 0.866f * size), From 756fd78a8897c3556b44e8ba8b692ba5a0012ff5 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 7 Feb 2017 13:52:19 +0900 Subject: [PATCH 12/46] Fix incorrect line endings. --- .../Platform/TestStorage.cs | 56 ++-- .../Tests/TestCasePauseOverlay.cs | 72 ++--- osu.Game/Beatmaps/Drawables/DifficultyIcon.cs | 134 ++++---- osu.Game/Beatmaps/Formats/BeatmapDecoder.cs | 2 +- osu.Game/Configuration/ProgressBarType.cs | 24 +- osu.Game/Configuration/RankingType.cs | 26 +- osu.Game/Configuration/ReleaseStream.cs | 20 +- osu.Game/Configuration/ScoreMeterType.cs | 18 +- osu.Game/Database/BeatmapSetInfo.cs | 64 ++-- .../UserInterface/LoadingAnimation.cs | 26 +- osu.Game/Graphics/UserInterface/OsuButton.cs | 80 ++--- osu.Game/Overlays/Options/OptionTextBox.cs | 90 +++--- .../Overlays/Options/OptionsSubsection.cs | 88 +++--- .../Sections/Audio/AudioDevicesOptions.cs | 34 +- .../Options/Sections/Audio/OffsetOptions.cs | 34 +- .../Overlays/Options/Sections/AudioSection.cs | 50 +-- .../Sections/Gameplay/SongSelectOptions.cs | 32 +- .../Options/Sections/GameplaySection.cs | 46 +-- .../Options/Sections/General/LoginOptions.cs | 296 +++++++++--------- .../Options/Sections/GeneralSection.cs | 50 +-- .../Options/Sections/GraphicsSection.cs | 56 ++-- .../Options/Sections/Input/KeyboardOptions.cs | 58 ++-- .../Overlays/Options/Sections/InputSection.cs | 52 +-- .../Options/Sections/MaintenanceSection.cs | 98 +++--- .../Sections/Online/InGameChatOptions.cs | 94 +++--- .../Options/Sections/OnlineSection.cs | 48 +-- .../Overlays/Options/Sections/SkinSection.cs | 148 ++++----- osu.Game/Overlays/Pause/PauseProgressBar.cs | 284 ++++++++--------- osu.Game/Overlays/Pause/PauseProgressGraph.cs | 12 +- osu.Game/Overlays/Pause/ResumeButton.cs | 42 +-- 30 files changed, 1067 insertions(+), 1067 deletions(-) diff --git a/osu.Desktop.VisualTests/Platform/TestStorage.cs b/osu.Desktop.VisualTests/Platform/TestStorage.cs index 95b767a852..ecf12d233a 100644 --- a/osu.Desktop.VisualTests/Platform/TestStorage.cs +++ b/osu.Desktop.VisualTests/Platform/TestStorage.cs @@ -1,29 +1,29 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework; -using osu.Framework.Desktop.Platform; -using SQLite.Net; -using SQLite.Net.Interop; -using SQLite.Net.Platform.Generic; -using SQLite.Net.Platform.Win32; - -namespace osu.Desktop.VisualTests.Platform -{ - public class TestStorage : DesktopStorage - { - public TestStorage(string baseName) : base(baseName) - { - } - - public override SQLiteConnection GetDatabase(string name) - { - ISQLitePlatform platform; - if (RuntimeInfo.IsWindows) - platform = new SQLitePlatformWin32(); - else - platform = new SQLitePlatformGeneric(); - return new SQLiteConnection(platform, $@":memory:"); - } - } +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework; +using osu.Framework.Desktop.Platform; +using SQLite.Net; +using SQLite.Net.Interop; +using SQLite.Net.Platform.Generic; +using SQLite.Net.Platform.Win32; + +namespace osu.Desktop.VisualTests.Platform +{ + public class TestStorage : DesktopStorage + { + public TestStorage(string baseName) : base(baseName) + { + } + + public override SQLiteConnection GetDatabase(string name) + { + ISQLitePlatform platform; + if (RuntimeInfo.IsWindows) + platform = new SQLitePlatformWin32(); + else + platform = new SQLitePlatformGeneric(); + return new SQLiteConnection(platform, $@":memory:"); + } + } } \ No newline at end of file diff --git a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs index dbcd1b93af..23c7cc45cf 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs @@ -1,44 +1,44 @@ -using System; -using OpenTK.Graphics; -using osu.Framework.Logging; -using osu.Framework.Graphics; -using osu.Game.Overlays.Pause; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Sprites; -using osu.Framework.Graphics.Colour; +using System; +using OpenTK.Graphics; +using osu.Framework.Logging; +using osu.Framework.Graphics; +using osu.Game.Overlays.Pause; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Colour; using osu.Framework.GameModes.Testing; using osu.Framework.Graphics.UserInterface; -namespace osu.Desktop.VisualTests.Tests -{ - class TestCasePauseOverlay : TestCase - { - public override string Name => @"PauseOverlay"; - - public override string Description => @"Tests the pause overlay"; - - private PauseOverlay pauseOverlay; - private int retryCount; - - public override void Reset() - { - base.Reset(); - - Add(pauseOverlay = new PauseOverlay - { - Depth = -1, - OnResume = () => Logger.Log(@"Resume"), - OnRetry = () => Logger.Log(@"Retry"), - OnQuit = () => Logger.Log(@"Quit") - }); - AddButton("Pause", pauseOverlay.Show); +namespace osu.Desktop.VisualTests.Tests +{ + class TestCasePauseOverlay : TestCase + { + public override string Name => @"PauseOverlay"; + + public override string Description => @"Tests the pause overlay"; + + private PauseOverlay pauseOverlay; + private int retryCount; + + public override void Reset() + { + base.Reset(); + + Add(pauseOverlay = new PauseOverlay + { + Depth = -1, + OnResume = () => Logger.Log(@"Resume"), + OnRetry = () => Logger.Log(@"Retry"), + OnQuit = () => Logger.Log(@"Quit") + }); + AddButton("Pause", pauseOverlay.Show); AddButton("Add Retry", delegate { retryCount++; pauseOverlay.Retries = retryCount; - }); - - retryCount = 0; + }); + + retryCount = 0; } - } -} + } +} diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs index 0d1a3b7320..298bbc4853 100644 --- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs +++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs @@ -1,55 +1,55 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using osu.Framework.Allocation; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Colour; -using osu.Framework.Graphics.Containers; -using osu.Game.Database; -using osu.Game.Graphics; -using osu.Game.Modes; -using OpenTK; -using OpenTK.Graphics; - +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; +using osu.Framework.Allocation; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Colour; +using osu.Framework.Graphics.Containers; +using osu.Game.Database; +using osu.Game.Graphics; +using osu.Game.Modes; +using OpenTK; +using OpenTK.Graphics; + namespace osu.Game.Beatmaps.Drawables { - class DifficultyIcon : Container - { - private readonly BeatmapInfo beatmap; - private OsuColour palette; - - public DifficultyIcon(BeatmapInfo beatmap) - { - this.beatmap = beatmap; - const float size = 20; - Size = new Vector2(size); - } - - [BackgroundDependencyLoader] + class DifficultyIcon : Container + { + private readonly BeatmapInfo beatmap; + private OsuColour palette; + + public DifficultyIcon(BeatmapInfo beatmap) + { + this.beatmap = beatmap; + const float size = 20; + Size = new Vector2(size); + } + + [BackgroundDependencyLoader] private void load(OsuColour palette) { this.palette = palette; Children = new[] - { - new TextAwesome - { - Anchor = Anchor.Centre, - TextSize = Size.X, - Colour = getColour(beatmap), - Icon = FontAwesome.fa_circle - }, - new TextAwesome - { - Anchor = Anchor.Centre, - TextSize = Size.X, - Colour = Color4.White, - Icon = Ruleset.GetRuleset(beatmap.Mode).Icon - } + { + new TextAwesome + { + Anchor = Anchor.Centre, + TextSize = Size.X, + Colour = getColour(beatmap), + Icon = FontAwesome.fa_circle + }, + new TextAwesome + { + Anchor = Anchor.Centre, + TextSize = Size.X, + Colour = Color4.White, + Icon = Ruleset.GetRuleset(beatmap.Mode).Icon + } }; - } - + } + enum DifficultyRating { Easy, @@ -57,35 +57,35 @@ namespace osu.Game.Beatmaps.Drawables Hard, Insane, Expert - } - + } + private DifficultyRating getDifficultyRating(BeatmapInfo beatmap) { var rating = beatmap.StarDifficulty; - if (rating < 1.5) return DifficultyRating.Easy; - if (rating < 2.25) return DifficultyRating.Normal; - if (rating < 3.75) return DifficultyRating.Hard; - if (rating < 5.25) return DifficultyRating.Insane; - return DifficultyRating.Expert; - } - - private Color4 getColour(BeatmapInfo beatmap) + if (rating < 1.5) return DifficultyRating.Easy; + if (rating < 2.25) return DifficultyRating.Normal; + if (rating < 3.75) return DifficultyRating.Hard; + if (rating < 5.25) return DifficultyRating.Insane; + return DifficultyRating.Expert; + } + + private Color4 getColour(BeatmapInfo beatmap) { - switch (getDifficultyRating(beatmap)) - { - case DifficultyRating.Easy: + switch (getDifficultyRating(beatmap)) + { + case DifficultyRating.Easy: return palette.Green; - default: - case DifficultyRating.Normal: - return palette.Yellow; - case DifficultyRating.Hard: - return palette.Pink; - case DifficultyRating.Insane: - return palette.Purple; - case DifficultyRating.Expert: - return palette.Gray0; + default: + case DifficultyRating.Normal: + return palette.Yellow; + case DifficultyRating.Hard: + return palette.Pink; + case DifficultyRating.Insane: + return palette.Purple; + case DifficultyRating.Expert: + return palette.Gray0; } - } + } } } \ No newline at end of file diff --git a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs index cd55f36ae3..82de5a2ed2 100644 --- a/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs +++ b/osu.Game/Beatmaps/Formats/BeatmapDecoder.cs @@ -63,4 +63,4 @@ namespace osu.Game.Beatmaps.Formats } } } -} +} diff --git a/osu.Game/Configuration/ProgressBarType.cs b/osu.Game/Configuration/ProgressBarType.cs index e252c84558..b77c2ee0d7 100644 --- a/osu.Game/Configuration/ProgressBarType.cs +++ b/osu.Game/Configuration/ProgressBarType.cs @@ -1,16 +1,16 @@ using System; using System.ComponentModel; -namespace osu.Game.Configuration -{ - public enum ProgressBarType - { - Off, - Pie, - [Description("Top Right")] - TopRight, - [Description("Bottom Right")] - BottomRight, - Bottom - } +namespace osu.Game.Configuration +{ + public enum ProgressBarType + { + Off, + Pie, + [Description("Top Right")] + TopRight, + [Description("Bottom Right")] + BottomRight, + Bottom + } } \ No newline at end of file diff --git a/osu.Game/Configuration/RankingType.cs b/osu.Game/Configuration/RankingType.cs index e2f0b4cd00..08bc271a36 100644 --- a/osu.Game/Configuration/RankingType.cs +++ b/osu.Game/Configuration/RankingType.cs @@ -1,16 +1,16 @@ -using System; +using System; using System.ComponentModel; -namespace osu.Game.Configuration -{ - public enum RankingType - { - Local, - [Description("Global")] - Top, - [Description("Selected Mods")] - SelectedMod, - Friends, - Country - } +namespace osu.Game.Configuration +{ + public enum RankingType + { + Local, + [Description("Global")] + Top, + [Description("Selected Mods")] + SelectedMod, + Friends, + Country + } } \ No newline at end of file diff --git a/osu.Game/Configuration/ReleaseStream.cs b/osu.Game/Configuration/ReleaseStream.cs index a03b2376a3..02cc7333ef 100644 --- a/osu.Game/Configuration/ReleaseStream.cs +++ b/osu.Game/Configuration/ReleaseStream.cs @@ -1,11 +1,11 @@ -using System; -namespace osu.Game.Configuration -{ - public enum ReleaseStream - { - Lazer, - //Stable40, - //Beta40, - //Stable - } +using System; +namespace osu.Game.Configuration +{ + public enum ReleaseStream + { + Lazer, + //Stable40, + //Beta40, + //Stable + } } \ No newline at end of file diff --git a/osu.Game/Configuration/ScoreMeterType.cs b/osu.Game/Configuration/ScoreMeterType.cs index 786de6b6bf..6077e91539 100644 --- a/osu.Game/Configuration/ScoreMeterType.cs +++ b/osu.Game/Configuration/ScoreMeterType.cs @@ -1,10 +1,10 @@ -using System; -namespace osu.Game.Configuration -{ - public enum ScoreMeterType - { - None, - Colour, - Error - } +using System; +namespace osu.Game.Configuration +{ + public enum ScoreMeterType + { + None, + Colour, + Error + } } \ No newline at end of file diff --git a/osu.Game/Database/BeatmapSetInfo.cs b/osu.Game/Database/BeatmapSetInfo.cs index 60637f8736..2ff9626941 100644 --- a/osu.Game/Database/BeatmapSetInfo.cs +++ b/osu.Game/Database/BeatmapSetInfo.cs @@ -1,32 +1,32 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using System.Collections.Generic; -using SQLite.Net.Attributes; -using SQLiteNetExtensions.Attributes; - -namespace osu.Game.Database -{ - public class BeatmapSetInfo - { - [PrimaryKey, AutoIncrement] - public int ID { get; set; } - - public int? OnlineBeatmapSetID { get; set; } = null; - - [OneToOne(CascadeOperations = CascadeOperation.All)] - public BeatmapMetadata Metadata { get; set; } - - [NotNull, ForeignKey(typeof(BeatmapMetadata))] - public int BeatmapMetadataID { get; set; } - - [OneToMany(CascadeOperations = CascadeOperation.All)] - public List Beatmaps { get; set; } - - public string Hash { get; set; } - - public string Path { get; set; } - } -} - +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; +using System.Collections.Generic; +using SQLite.Net.Attributes; +using SQLiteNetExtensions.Attributes; + +namespace osu.Game.Database +{ + public class BeatmapSetInfo + { + [PrimaryKey, AutoIncrement] + public int ID { get; set; } + + public int? OnlineBeatmapSetID { get; set; } = null; + + [OneToOne(CascadeOperations = CascadeOperation.All)] + public BeatmapMetadata Metadata { get; set; } + + [NotNull, ForeignKey(typeof(BeatmapMetadata))] + public int BeatmapMetadataID { get; set; } + + [OneToMany(CascadeOperations = CascadeOperation.All)] + public List Beatmaps { get; set; } + + public string Hash { get; set; } + + public string Path { get; set; } + } +} + diff --git a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs index 49887dd8db..0772ea912f 100644 --- a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs +++ b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs @@ -1,16 +1,16 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; using osu.Framework.Graphics.Sprites; -namespace osu.Game.Graphics.UserInterface -{ - public class LoadingAnimation : SpriteText - { - public LoadingAnimation() - { - Text = "Loading"; - } - } +namespace osu.Game.Graphics.UserInterface +{ + public class LoadingAnimation : SpriteText + { + public LoadingAnimation() + { + Text = "Loading"; + } + } } \ No newline at end of file diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs index ed7b9ffb29..9b34a8462d 100644 --- a/osu.Game/Graphics/UserInterface/OsuButton.cs +++ b/osu.Game/Graphics/UserInterface/OsuButton.cs @@ -1,27 +1,27 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using OpenTK.Graphics; -using osu.Framework.Allocation; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Sprites; -using osu.Framework.Graphics.Transformations; -using osu.Framework.Graphics.UserInterface; +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; +using OpenTK.Graphics; +using osu.Framework.Allocation; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Transformations; +using osu.Framework.Graphics.UserInterface; using osu.Framework.Input; -using osu.Game.Graphics.Backgrounds; -using osu.Game.Graphics.Sprites; -using osu.Game.Overlays; - -namespace osu.Game.Graphics.UserInterface -{ - public class OsuButton : Button - { - private Box hover; - - public OsuButton() - { - Height = 40; +using osu.Game.Graphics.Backgrounds; +using osu.Game.Graphics.Sprites; +using osu.Game.Overlays; + +namespace osu.Game.Graphics.UserInterface +{ + public class OsuButton : Button + { + private Box hover; + + public OsuButton() + { + Height = 40; } protected override SpriteText CreateText() => new OsuSpriteText @@ -32,14 +32,14 @@ namespace osu.Game.Graphics.UserInterface Font = @"Exo2.0-Bold", }; - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { Colour = colours.BlueDark; - Content.Masking = true; - Content.CornerRadius = 5; - + Content.Masking = true; + Content.CornerRadius = 5; + Add(new Drawable[] { new Triangles @@ -55,31 +55,31 @@ namespace osu.Game.Graphics.UserInterface Colour = Color4.White.Opacity(0.1f), Alpha = 0, }, - }); - } - + }); + } + protected override bool OnHover(InputState state) { hover.FadeIn(200); return base.OnHover(state); - } - + } + protected override void OnHoverLost(InputState state) { hover.FadeOut(200); base.OnHoverLost(state); - } - + } + protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { Content.ScaleTo(0.9f, 4000, EasingTypes.OutQuint); return base.OnMouseDown(state, args); - } - + } + protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) { Content.ScaleTo(1, 1000, EasingTypes.OutElastic); return base.OnMouseUp(state, args); - } - } + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/OptionTextBox.cs b/osu.Game/Overlays/Options/OptionTextBox.cs index 101ba2c0c9..ce39b0f071 100644 --- a/osu.Game/Overlays/Options/OptionTextBox.cs +++ b/osu.Game/Overlays/Options/OptionTextBox.cs @@ -1,53 +1,53 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using osu.Framework.Configuration; -using osu.Framework.Graphics.UserInterface; -using osu.Game.Graphics.UserInterface; - -namespace osu.Game.Overlays.Options -{ - public class OptionTextBox : OsuTextBox - { - private Bindable bindable; - - public Bindable Bindable - { - set - { - if (bindable != null) - bindable.ValueChanged -= bindableValueChanged; - bindable = value; - if (bindable != null) - { - base.Text = bindable.Value; - bindable.ValueChanged += bindableValueChanged; - } - } - } - +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; +using osu.Framework.Configuration; +using osu.Framework.Graphics.UserInterface; +using osu.Game.Graphics.UserInterface; + +namespace osu.Game.Overlays.Options +{ + public class OptionTextBox : OsuTextBox + { + private Bindable bindable; + + public Bindable Bindable + { + set + { + if (bindable != null) + bindable.ValueChanged -= bindableValueChanged; + bindable = value; + if (bindable != null) + { + base.Text = bindable.Value; + bindable.ValueChanged += bindableValueChanged; + } + } + } + protected override string InternalText { get { return base.InternalText; } set { - base.InternalText = value; - if (bindable != null) + base.InternalText = value; + if (bindable != null) bindable.Value = value; } - } - - private void bindableValueChanged(object sender, EventArgs e) - { - Text = bindable.Value; - } - - protected override void Dispose(bool isDisposing) - { - if (bindable != null) - bindable.ValueChanged -= bindableValueChanged; - base.Dispose(isDisposing); - } - } + } + + private void bindableValueChanged(object sender, EventArgs e) + { + Text = bindable.Value; + } + + protected override void Dispose(bool isDisposing) + { + if (bindable != null) + bindable.ValueChanged -= bindableValueChanged; + base.Dispose(isDisposing); + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/OptionsSubsection.cs b/osu.Game/Overlays/Options/OptionsSubsection.cs index 42e4b50558..a495d3780a 100644 --- a/osu.Game/Overlays/Options/OptionsSubsection.cs +++ b/osu.Game/Overlays/Options/OptionsSubsection.cs @@ -1,44 +1,44 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using OpenTK; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Primitives; -using osu.Framework.Graphics.Sprites; -using osu.Game.Graphics.Sprites; - -namespace osu.Game.Overlays.Options -{ - public abstract class OptionsSubsection : FlowContainer - { - private Container content; - protected override Container Content => content; - - protected abstract string Header { get; } - - public OptionsSubsection() - { - RelativeSizeAxes = Axes.X; - AutoSizeAxes = Axes.Y; - Direction = FlowDirection.VerticalOnly; - AddInternal(new Drawable[] - { - new OsuSpriteText - { - Text = Header.ToUpper(), - Margin = new MarginPadding { Bottom = 10 }, - Font = @"Exo2.0-Black", - }, - content = new FlowContainer - { - Direction = FlowDirection.VerticalOnly, - RelativeSizeAxes = Axes.X, - AutoSizeAxes = Axes.Y, - Spacing = new Vector2(0, 5), - }, - }); - } - } -} - +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using OpenTK; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Primitives; +using osu.Framework.Graphics.Sprites; +using osu.Game.Graphics.Sprites; + +namespace osu.Game.Overlays.Options +{ + public abstract class OptionsSubsection : FlowContainer + { + private Container content; + protected override Container Content => content; + + protected abstract string Header { get; } + + public OptionsSubsection() + { + RelativeSizeAxes = Axes.X; + AutoSizeAxes = Axes.Y; + Direction = FlowDirection.VerticalOnly; + AddInternal(new Drawable[] + { + new OsuSpriteText + { + Text = Header.ToUpper(), + Margin = new MarginPadding { Bottom = 10 }, + Font = @"Exo2.0-Black", + }, + content = new FlowContainer + { + Direction = FlowDirection.VerticalOnly, + RelativeSizeAxes = Axes.X, + AutoSizeAxes = Axes.Y, + Spacing = new Vector2(0, 5), + }, + }); + } + } +} + diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs index b9171cd6f6..a67ce94901 100644 --- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs +++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs @@ -1,18 +1,18 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -namespace osu.Game.Overlays.Options.Sections.Audio -{ - public class AudioDevicesOptions : OptionsSubsection - { - protected override string Header => "Devices"; - - public AudioDevicesOptions() - { - Children = new[] - { - new OptionLabel { Text = "Output device: TODO dropdown" } - }; - } - } +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +namespace osu.Game.Overlays.Options.Sections.Audio +{ + public class AudioDevicesOptions : OptionsSubsection + { + protected override string Header => "Devices"; + + public AudioDevicesOptions() + { + Children = new[] + { + new OptionLabel { Text = "Output device: TODO dropdown" } + }; + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs index 2f7acdc8c0..877795693f 100644 --- a/osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs +++ b/osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs @@ -1,17 +1,17 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Allocation; -using osu.Framework.Configuration; -using osu.Framework.Graphics; -using osu.Game.Configuration; -using osu.Game.Graphics.UserInterface; - -namespace osu.Game.Overlays.Options.Sections.Audio -{ - public class OffsetOptions : OptionsSubsection - { - protected override string Header => "Offset Adjustment"; +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Allocation; +using osu.Framework.Configuration; +using osu.Framework.Graphics; +using osu.Game.Configuration; +using osu.Game.Graphics.UserInterface; + +namespace osu.Game.Overlays.Options.Sections.Audio +{ + public class OffsetOptions : OptionsSubsection + { + protected override string Header => "Offset Adjustment"; [BackgroundDependencyLoader] private void load(OsuConfigManager config) @@ -29,6 +29,6 @@ namespace osu.Game.Overlays.Options.Sections.Audio Text = "Offset wizard" } }; - } - } -} + } + } +} diff --git a/osu.Game/Overlays/Options/Sections/AudioSection.cs b/osu.Game/Overlays/Options/Sections/AudioSection.cs index 91145bb75d..2824e6d5e5 100644 --- a/osu.Game/Overlays/Options/Sections/AudioSection.cs +++ b/osu.Game/Overlays/Options/Sections/AudioSection.cs @@ -1,26 +1,26 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework; -using osu.Framework.Graphics; -using osu.Game.Graphics; -using osu.Game.Overlays.Options.Sections.Audio; - -namespace osu.Game.Overlays.Options.Sections -{ - public class AudioSection : OptionsSection - { - public override string Header => "Audio"; - public override FontAwesome Icon => FontAwesome.fa_headphones; - - public AudioSection() - { - Children = new Drawable[] - { - new AudioDevicesOptions { Alpha = RuntimeInfo.IsWindows ? 1 : 0 }, - new VolumeOptions(), - new OffsetOptions(), - }; - } - } +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework; +using osu.Framework.Graphics; +using osu.Game.Graphics; +using osu.Game.Overlays.Options.Sections.Audio; + +namespace osu.Game.Overlays.Options.Sections +{ + public class AudioSection : OptionsSection + { + public override string Header => "Audio"; + public override FontAwesome Icon => FontAwesome.fa_headphones; + + public AudioSection() + { + Children = new Drawable[] + { + new AudioDevicesOptions { Alpha = RuntimeInfo.IsWindows ? 1 : 0 }, + new VolumeOptions(), + new OffsetOptions(), + }; + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/Sections/Gameplay/SongSelectOptions.cs b/osu.Game/Overlays/Options/Sections/Gameplay/SongSelectOptions.cs index a1ea4e2286..9af10928a1 100644 --- a/osu.Game/Overlays/Options/Sections/Gameplay/SongSelectOptions.cs +++ b/osu.Game/Overlays/Options/Sections/Gameplay/SongSelectOptions.cs @@ -1,16 +1,16 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Allocation; -using osu.Framework.Configuration; -using osu.Framework.Graphics; -using osu.Game.Configuration; - -namespace osu.Game.Overlays.Options.Sections.Gameplay -{ - public class SongSelectOptions : OptionsSubsection - { - protected override string Header => "Song Select"; +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Allocation; +using osu.Framework.Configuration; +using osu.Framework.Graphics; +using osu.Game.Configuration; + +namespace osu.Game.Overlays.Options.Sections.Gameplay +{ + public class SongSelectOptions : OptionsSubsection + { + protected override string Header => "Song Select"; [BackgroundDependencyLoader] private void load(OsuConfigManager config) @@ -29,6 +29,6 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay }, }; } - } -} - + } +} + diff --git a/osu.Game/Overlays/Options/Sections/GameplaySection.cs b/osu.Game/Overlays/Options/Sections/GameplaySection.cs index 875fa18fa6..0b3be16ff8 100644 --- a/osu.Game/Overlays/Options/Sections/GameplaySection.cs +++ b/osu.Game/Overlays/Options/Sections/GameplaySection.cs @@ -1,24 +1,24 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Graphics; -using osu.Game.Graphics; -using osu.Game.Overlays.Options.Sections.Gameplay; - -namespace osu.Game.Overlays.Options.Sections -{ - public class GameplaySection : OptionsSection - { - public override string Header => "Gameplay"; - public override FontAwesome Icon => FontAwesome.fa_circle_o; - - public GameplaySection() - { - base.Children = new Drawable[] - { - new Gameplay.GeneralOptions(), - new SongSelectOptions(), - }; - } - } +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Graphics; +using osu.Game.Graphics; +using osu.Game.Overlays.Options.Sections.Gameplay; + +namespace osu.Game.Overlays.Options.Sections +{ + public class GameplaySection : OptionsSection + { + public override string Header => "Gameplay"; + public override FontAwesome Icon => FontAwesome.fa_circle_o; + + public GameplaySection() + { + base.Children = new Drawable[] + { + new Gameplay.GeneralOptions(), + new SongSelectOptions(), + }; + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs b/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs index 63417c1f0c..d0ba121fef 100644 --- a/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs +++ b/osu.Game/Overlays/Options/Sections/General/LoginOptions.cs @@ -1,148 +1,148 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Allocation; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Primitives; -using osu.Framework.Graphics.Sprites; -using osu.Framework.Graphics.UserInterface; -using osu.Game.Configuration; -using osu.Game.Graphics.Sprites; -using osu.Game.Graphics.UserInterface; -using osu.Game.Online.API; -using OpenTK; - -namespace osu.Game.Overlays.Options.Sections.General -{ - public class LoginOptions : OptionsSubsection, IOnlineComponent - { - private bool bounding = true; - - protected override string Header => "Sign In"; - - public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty; - - public bool Bounding - { - get { return bounding; } - set - { - bounding = value; - Invalidate(Invalidation.Geometry); - } - } - - [BackgroundDependencyLoader(permitNulls: true)] - private void load(APIAccess api) - { - api?.Register(this); - } - - public void APIStateChanged(APIAccess api, APIState state) - { - switch (state) - { - case APIState.Offline: - Children = new Drawable[] - { - new LoginForm() - }; - break; - case APIState.Failing: - Children = new Drawable[] - { - new OsuSpriteText - { - Text = "Connection failing :(", - }, - }; - break; - case APIState.Connecting: - Children = new Drawable[] - { - new OsuSpriteText - { - Text = "Connecting...", - }, - }; - break; - case APIState.Online: - Children = new Drawable[] - { - new OsuSpriteText - { - Text = $"Connected as {api.Username}!", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Sign out", - Action = api.Logout - } - }; - break; - } - } - - class LoginForm : FlowContainer - { - private TextBox username; - private TextBox password; - private APIAccess api; - - private OsuCheckbox saveUsername; - private OsuCheckbox savePassword; - - private void performLogin() - { - if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text)) - api.Login(username.Text, password.Text); - } - - [BackgroundDependencyLoader(permitNulls: true)] - private void load(APIAccess api, OsuConfigManager config) - { - this.api = api; - Direction = FlowDirection.VerticalOnly; - AutoSizeAxes = Axes.Y; - RelativeSizeAxes = Axes.X; - Spacing = new Vector2(0, 5); - Children = new Drawable[] - { - username = new OsuTextBox - { - RelativeSizeAxes = Axes.X, - Text = api?.Username ?? string.Empty - }, - password = new OsuPasswordTextBox - { - RelativeSizeAxes = Axes.X - }, - saveUsername = new OsuCheckbox - { - LabelText = "Remember username", - Bindable = config.GetBindable(OsuConfig.SaveUsername), - }, - savePassword = new OsuCheckbox - { - LabelText = "Stay logged in", - Bindable = config.GetBindable(OsuConfig.SavePassword), - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Sign in", - Action = performLogin - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Register new account", - //Action = registerLink - } - }; - } - } - } -} +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Allocation; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Primitives; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.UserInterface; +using osu.Game.Configuration; +using osu.Game.Graphics.Sprites; +using osu.Game.Graphics.UserInterface; +using osu.Game.Online.API; +using OpenTK; + +namespace osu.Game.Overlays.Options.Sections.General +{ + public class LoginOptions : OptionsSubsection, IOnlineComponent + { + private bool bounding = true; + + protected override string Header => "Sign In"; + + public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty; + + public bool Bounding + { + get { return bounding; } + set + { + bounding = value; + Invalidate(Invalidation.Geometry); + } + } + + [BackgroundDependencyLoader(permitNulls: true)] + private void load(APIAccess api) + { + api?.Register(this); + } + + public void APIStateChanged(APIAccess api, APIState state) + { + switch (state) + { + case APIState.Offline: + Children = new Drawable[] + { + new LoginForm() + }; + break; + case APIState.Failing: + Children = new Drawable[] + { + new OsuSpriteText + { + Text = "Connection failing :(", + }, + }; + break; + case APIState.Connecting: + Children = new Drawable[] + { + new OsuSpriteText + { + Text = "Connecting...", + }, + }; + break; + case APIState.Online: + Children = new Drawable[] + { + new OsuSpriteText + { + Text = $"Connected as {api.Username}!", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Sign out", + Action = api.Logout + } + }; + break; + } + } + + class LoginForm : FlowContainer + { + private TextBox username; + private TextBox password; + private APIAccess api; + + private OsuCheckbox saveUsername; + private OsuCheckbox savePassword; + + private void performLogin() + { + if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text)) + api.Login(username.Text, password.Text); + } + + [BackgroundDependencyLoader(permitNulls: true)] + private void load(APIAccess api, OsuConfigManager config) + { + this.api = api; + Direction = FlowDirection.VerticalOnly; + AutoSizeAxes = Axes.Y; + RelativeSizeAxes = Axes.X; + Spacing = new Vector2(0, 5); + Children = new Drawable[] + { + username = new OsuTextBox + { + RelativeSizeAxes = Axes.X, + Text = api?.Username ?? string.Empty + }, + password = new OsuPasswordTextBox + { + RelativeSizeAxes = Axes.X + }, + saveUsername = new OsuCheckbox + { + LabelText = "Remember username", + Bindable = config.GetBindable(OsuConfig.SaveUsername), + }, + savePassword = new OsuCheckbox + { + LabelText = "Stay logged in", + Bindable = config.GetBindable(OsuConfig.SavePassword), + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Sign in", + Action = performLogin + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Register new account", + //Action = registerLink + } + }; + } + } + } +} diff --git a/osu.Game/Overlays/Options/Sections/GeneralSection.cs b/osu.Game/Overlays/Options/Sections/GeneralSection.cs index 4952dfeef2..c90732f262 100644 --- a/osu.Game/Overlays/Options/Sections/GeneralSection.cs +++ b/osu.Game/Overlays/Options/Sections/GeneralSection.cs @@ -1,25 +1,25 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Graphics; -using osu.Game.Graphics; -using osu.Game.Overlays.Options.Sections.General; - -namespace osu.Game.Overlays.Options.Sections -{ - public class GeneralSection : OptionsSection - { - public override string Header => "General"; - public override FontAwesome Icon => FontAwesome.fa_gear; - - public GeneralSection() - { - Children = new Drawable[] - { - new LanguageOptions(), - new UpdateOptions(), - }; - } - } -} - +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Graphics; +using osu.Game.Graphics; +using osu.Game.Overlays.Options.Sections.General; + +namespace osu.Game.Overlays.Options.Sections +{ + public class GeneralSection : OptionsSection + { + public override string Header => "General"; + public override FontAwesome Icon => FontAwesome.fa_gear; + + public GeneralSection() + { + Children = new Drawable[] + { + new LanguageOptions(), + new UpdateOptions(), + }; + } + } +} + diff --git a/osu.Game/Overlays/Options/Sections/GraphicsSection.cs b/osu.Game/Overlays/Options/Sections/GraphicsSection.cs index 2f5b7fad64..1ca7bc5a83 100644 --- a/osu.Game/Overlays/Options/Sections/GraphicsSection.cs +++ b/osu.Game/Overlays/Options/Sections/GraphicsSection.cs @@ -1,28 +1,28 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Graphics; -using osu.Game.Graphics; -using osu.Game.Overlays.Options.Sections.Graphics; - -namespace osu.Game.Overlays.Options.Sections -{ - public class GraphicsSection : OptionsSection - { - public override string Header => "Graphics"; - public override FontAwesome Icon => FontAwesome.fa_laptop; - - public GraphicsSection() - { - Children = new Drawable[] - { - new RendererOptions(), - new LayoutOptions(), - new DetailOptions(), - new MainMenuOptions(), - new SongSelectGraphicsOptions(), - }; - } - } -} - +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Graphics; +using osu.Game.Graphics; +using osu.Game.Overlays.Options.Sections.Graphics; + +namespace osu.Game.Overlays.Options.Sections +{ + public class GraphicsSection : OptionsSection + { + public override string Header => "Graphics"; + public override FontAwesome Icon => FontAwesome.fa_laptop; + + public GraphicsSection() + { + Children = new Drawable[] + { + new RendererOptions(), + new LayoutOptions(), + new DetailOptions(), + new MainMenuOptions(), + new SongSelectGraphicsOptions(), + }; + } + } +} + diff --git a/osu.Game/Overlays/Options/Sections/Input/KeyboardOptions.cs b/osu.Game/Overlays/Options/Sections/Input/KeyboardOptions.cs index cdd7924110..20e5d5f094 100644 --- a/osu.Game/Overlays/Options/Sections/Input/KeyboardOptions.cs +++ b/osu.Game/Overlays/Options/Sections/Input/KeyboardOptions.cs @@ -1,30 +1,30 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Graphics; -using osu.Game.Graphics.UserInterface; - -namespace osu.Game.Overlays.Options.Sections.Input -{ - public class KeyboardOptions : OptionsSubsection - { - protected override string Header => "Keyboard"; - - public KeyboardOptions() - { - Children = new Drawable[] - { - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Change keyboard bindings" - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "osu!mania layout" - } - }; - } - } +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Graphics; +using osu.Game.Graphics.UserInterface; + +namespace osu.Game.Overlays.Options.Sections.Input +{ + public class KeyboardOptions : OptionsSubsection + { + protected override string Header => "Keyboard"; + + public KeyboardOptions() + { + Children = new Drawable[] + { + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Change keyboard bindings" + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "osu!mania layout" + } + }; + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/Sections/InputSection.cs b/osu.Game/Overlays/Options/Sections/InputSection.cs index f21dd81cb4..c8c4a8a8e2 100644 --- a/osu.Game/Overlays/Options/Sections/InputSection.cs +++ b/osu.Game/Overlays/Options/Sections/InputSection.cs @@ -1,26 +1,26 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Graphics; -using osu.Game.Graphics; -using osu.Game.Overlays.Options.Sections.Input; - -namespace osu.Game.Overlays.Options.Sections -{ - public class InputSection : OptionsSection - { - public override string Header => "Input"; - public override FontAwesome Icon => FontAwesome.fa_keyboard_o; - - public InputSection() - { - Children = new Drawable[] - { - new MouseOptions(), - new KeyboardOptions(), - new OtherInputOptions(), - }; - } - } -} - +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Graphics; +using osu.Game.Graphics; +using osu.Game.Overlays.Options.Sections.Input; + +namespace osu.Game.Overlays.Options.Sections +{ + public class InputSection : OptionsSection + { + public override string Header => "Input"; + public override FontAwesome Icon => FontAwesome.fa_keyboard_o; + + public InputSection() + { + Children = new Drawable[] + { + new MouseOptions(), + new KeyboardOptions(), + new OtherInputOptions(), + }; + } + } +} + diff --git a/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs b/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs index 4347c839a6..8cf1421420 100644 --- a/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs +++ b/osu.Game/Overlays/Options/Sections/MaintenanceSection.cs @@ -1,50 +1,50 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Graphics; -using osu.Game.Graphics; -using osu.Game.Graphics.UserInterface; -using OpenTK; - -namespace osu.Game.Overlays.Options.Sections -{ - public class MaintenanceSection : OptionsSection - { - public override string Header => "Maintenance"; - public override FontAwesome Icon => FontAwesome.fa_wrench; - - public MaintenanceSection() - { - content.Spacing = new Vector2(0, 5); - Children = new Drawable[] - { - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Delete all unranked maps", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Repair folder permissions", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Mark all maps as played", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Run osu! updater", - }, - new OptionLabel - { - Text = "TODO: osu version here", - Anchor = Anchor.TopCentre, - Origin = Anchor.TopCentre, - }, - }; - } - } +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Graphics; +using osu.Game.Graphics; +using osu.Game.Graphics.UserInterface; +using OpenTK; + +namespace osu.Game.Overlays.Options.Sections +{ + public class MaintenanceSection : OptionsSection + { + public override string Header => "Maintenance"; + public override FontAwesome Icon => FontAwesome.fa_wrench; + + public MaintenanceSection() + { + content.Spacing = new Vector2(0, 5); + Children = new Drawable[] + { + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Delete all unranked maps", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Repair folder permissions", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Mark all maps as played", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Run osu! updater", + }, + new OptionLabel + { + Text = "TODO: osu version here", + Anchor = Anchor.TopCentre, + Origin = Anchor.TopCentre, + }, + }; + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/Sections/Online/InGameChatOptions.cs b/osu.Game/Overlays/Options/Sections/Online/InGameChatOptions.cs index 6e41933738..dd3ec3265e 100644 --- a/osu.Game/Overlays/Options/Sections/Online/InGameChatOptions.cs +++ b/osu.Game/Overlays/Options/Sections/Online/InGameChatOptions.cs @@ -1,55 +1,55 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Allocation; -using osu.Framework.Graphics; -using osu.Game.Configuration; -using osu.Game.Graphics.UserInterface; - -namespace osu.Game.Overlays.Options.Sections.Online -{ - public class InGameChatOptions : OptionsSubsection - { - private OptionTextBox chatIgnoreList; - private OptionTextBox chatHighlightWords; - protected override string Header => "Chat"; - - [BackgroundDependencyLoader] - private void load(OsuConfigManager config) - { - Children = new Drawable[] - { - new OsuCheckbox - { - LabelText = "Filter offensive words", - Bindable = config.GetBindable(OsuConfig.ChatFilter) - }, - new OsuCheckbox - { - LabelText = "Filter foreign characters", - Bindable = config.GetBindable(OsuConfig.ChatRemoveForeign) - }, - new OsuCheckbox - { - LabelText = "Log private messages", - Bindable = config.GetBindable(OsuConfig.LogPrivateMessages) - }, - new OsuCheckbox - { - LabelText = "Block private messages from non-friends", - Bindable = config.GetBindable(OsuConfig.BlockNonFriendPM) - }, - new OptionLabel { Text = "Chat ignore list (space-seperated list)" }, +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Allocation; +using osu.Framework.Graphics; +using osu.Game.Configuration; +using osu.Game.Graphics.UserInterface; + +namespace osu.Game.Overlays.Options.Sections.Online +{ + public class InGameChatOptions : OptionsSubsection + { + private OptionTextBox chatIgnoreList; + private OptionTextBox chatHighlightWords; + protected override string Header => "Chat"; + + [BackgroundDependencyLoader] + private void load(OsuConfigManager config) + { + Children = new Drawable[] + { + new OsuCheckbox + { + LabelText = "Filter offensive words", + Bindable = config.GetBindable(OsuConfig.ChatFilter) + }, + new OsuCheckbox + { + LabelText = "Filter foreign characters", + Bindable = config.GetBindable(OsuConfig.ChatRemoveForeign) + }, + new OsuCheckbox + { + LabelText = "Log private messages", + Bindable = config.GetBindable(OsuConfig.LogPrivateMessages) + }, + new OsuCheckbox + { + LabelText = "Block private messages from non-friends", + Bindable = config.GetBindable(OsuConfig.BlockNonFriendPM) + }, + new OptionLabel { Text = "Chat ignore list (space-seperated list)" }, chatIgnoreList = new OptionTextBox { RelativeSizeAxes = Axes.X, Bindable = config.GetBindable(OsuConfig.IgnoreList) - }, - new OptionLabel { Text = "Chat highlight words (space-seperated list)" }, + }, + new OptionLabel { Text = "Chat highlight words (space-seperated list)" }, chatHighlightWords = new OptionTextBox { RelativeSizeAxes = Axes.X, Bindable = config.GetBindable(OsuConfig.HighlightWords) - }, - }; + }, + }; } - } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/Sections/OnlineSection.cs b/osu.Game/Overlays/Options/Sections/OnlineSection.cs index e204c5a81a..08ddfbea02 100644 --- a/osu.Game/Overlays/Options/Sections/OnlineSection.cs +++ b/osu.Game/Overlays/Options/Sections/OnlineSection.cs @@ -1,26 +1,26 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Graphics; -using osu.Game.Graphics; -using osu.Game.Overlays.Options.Sections.Online; - -namespace osu.Game.Overlays.Options.Sections -{ - public class OnlineSection : OptionsSection - { - public override string Header => "Online"; - public override FontAwesome Icon => FontAwesome.fa_globe; - - public OnlineSection() - { - Children = new Drawable[] - { +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Graphics; +using osu.Game.Graphics; +using osu.Game.Overlays.Options.Sections.Online; + +namespace osu.Game.Overlays.Options.Sections +{ + public class OnlineSection : OptionsSection + { + public override string Header => "Online"; + public override FontAwesome Icon => FontAwesome.fa_globe; + + public OnlineSection() + { + Children = new Drawable[] + { new InGameChatOptions(), - new PrivacyOptions(), - new NotificationsOptions(), - new IntegrationOptions(), - }; - } - } + new PrivacyOptions(), + new NotificationsOptions(), + new IntegrationOptions(), + }; + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Options/Sections/SkinSection.cs b/osu.Game/Overlays/Options/Sections/SkinSection.cs index 720b3f35a2..e1d59fa565 100644 --- a/osu.Game/Overlays/Options/Sections/SkinSection.cs +++ b/osu.Game/Overlays/Options/Sections/SkinSection.cs @@ -1,75 +1,75 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using osu.Framework.Allocation; -using osu.Framework.Configuration; -using osu.Framework.Graphics; -using osu.Game.Configuration; -using osu.Game.Graphics; -using osu.Game.Graphics.UserInterface; -using OpenTK; - -namespace osu.Game.Overlays.Options.Sections -{ - public class SkinSection : OptionsSection - { - public override string Header => "Skin"; - public override FontAwesome Icon => FontAwesome.fa_paint_brush; - - [BackgroundDependencyLoader] - private void load(OsuConfigManager config) - { - content.Spacing = new Vector2(0, 5); - Children = new Drawable[] - { - new OptionLabel { Text = "TODO: Skin preview textures" }, - new OptionLabel { Text = "Current skin: TODO dropdown" }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Preview gameplay", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Open skin folder", - }, - new OsuButton - { - RelativeSizeAxes = Axes.X, - Text = "Export as .osk", - }, - new OsuCheckbox - { - LabelText = "Ignore all beatmap skins", - Bindable = config.GetBindable(OsuConfig.IgnoreBeatmapSkins) - }, - new OsuCheckbox - { - LabelText = "Use skin's sound samples", - Bindable = config.GetBindable(OsuConfig.SkinSamples) - }, - new OsuCheckbox - { - LabelText = "Use Taiko skin for Taiko mode", - Bindable = config.GetBindable(OsuConfig.UseTaikoSkin) - }, - new OsuCheckbox - { - LabelText = "Always use skin cursor", - Bindable = config.GetBindable(OsuConfig.UseSkinCursor) - }, - new OptionSlider - { - LabelText = "Cursor size", - Bindable = (BindableDouble)config.GetBindable(OsuConfig.CursorSize) - }, - new OsuCheckbox - { - LabelText = "Automatic cursor size", - Bindable = config.GetBindable(OsuConfig.AutomaticCursorSizing) - }, - }; - } - } +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.Allocation; +using osu.Framework.Configuration; +using osu.Framework.Graphics; +using osu.Game.Configuration; +using osu.Game.Graphics; +using osu.Game.Graphics.UserInterface; +using OpenTK; + +namespace osu.Game.Overlays.Options.Sections +{ + public class SkinSection : OptionsSection + { + public override string Header => "Skin"; + public override FontAwesome Icon => FontAwesome.fa_paint_brush; + + [BackgroundDependencyLoader] + private void load(OsuConfigManager config) + { + content.Spacing = new Vector2(0, 5); + Children = new Drawable[] + { + new OptionLabel { Text = "TODO: Skin preview textures" }, + new OptionLabel { Text = "Current skin: TODO dropdown" }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Preview gameplay", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Open skin folder", + }, + new OsuButton + { + RelativeSizeAxes = Axes.X, + Text = "Export as .osk", + }, + new OsuCheckbox + { + LabelText = "Ignore all beatmap skins", + Bindable = config.GetBindable(OsuConfig.IgnoreBeatmapSkins) + }, + new OsuCheckbox + { + LabelText = "Use skin's sound samples", + Bindable = config.GetBindable(OsuConfig.SkinSamples) + }, + new OsuCheckbox + { + LabelText = "Use Taiko skin for Taiko mode", + Bindable = config.GetBindable(OsuConfig.UseTaikoSkin) + }, + new OsuCheckbox + { + LabelText = "Always use skin cursor", + Bindable = config.GetBindable(OsuConfig.UseSkinCursor) + }, + new OptionSlider + { + LabelText = "Cursor size", + Bindable = (BindableDouble)config.GetBindable(OsuConfig.CursorSize) + }, + new OsuCheckbox + { + LabelText = "Automatic cursor size", + Bindable = config.GetBindable(OsuConfig.AutomaticCursorSizing) + }, + }; + } + } } \ No newline at end of file diff --git a/osu.Game/Overlays/Pause/PauseProgressBar.cs b/osu.Game/Overlays/Pause/PauseProgressBar.cs index 28824cb7ea..6edba0dc2d 100644 --- a/osu.Game/Overlays/Pause/PauseProgressBar.cs +++ b/osu.Game/Overlays/Pause/PauseProgressBar.cs @@ -1,147 +1,147 @@ -using OpenTK.Graphics; -using osu.Framework.Allocation; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Sprites; -using osu.Framework.Graphics.Containers; +using OpenTK.Graphics; +using osu.Framework.Allocation; +using osu.Framework.Graphics; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; using osu.Framework.Graphics.Primitives; -namespace osu.Game.Overlays.Pause -{ - public class PauseProgressBar : Container - { - private Color4 fillColour = new Color4(221, 255, 255, 255); - private Color4 glowColour = new Color4(221, 255, 255, 150); - - private Container fill; - private WorkingBeatmap current; - - [BackgroundDependencyLoader] - private void load(OsuGameBase osuGame) - { - current = osuGame.Beatmap.Value; - } - - protected override void Update() - { - base.Update(); - - if (current?.TrackLoaded ?? false) - { - fill.Width = (float)(current.Track.CurrentTime / current.Track.Length); - } - } - - public PauseProgressBar() - { - RelativeSizeAxes = Axes.X; - Height = 60; - - Children = new Drawable[] - { - new PauseProgressGraph - { - RelativeSizeAxes = Axes.X, - Origin = Anchor.BottomCentre, - Anchor = Anchor.BottomCentre, - Height = 35, - Margin = new MarginPadding - { - Bottom = 5 - } - }, - new Container - { - Origin = Anchor.BottomRight, - Anchor = Anchor.BottomRight, - RelativeSizeAxes = Axes.X, - Height = 5, - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - Colour = Color4.Black, - Alpha = 0.5f - } - } - }, - fill = new Container - { +namespace osu.Game.Overlays.Pause +{ + public class PauseProgressBar : Container + { + private Color4 fillColour = new Color4(221, 255, 255, 255); + private Color4 glowColour = new Color4(221, 255, 255, 150); + + private Container fill; + private WorkingBeatmap current; + + [BackgroundDependencyLoader] + private void load(OsuGameBase osuGame) + { + current = osuGame.Beatmap.Value; + } + + protected override void Update() + { + base.Update(); + + if (current?.TrackLoaded ?? false) + { + fill.Width = (float)(current.Track.CurrentTime / current.Track.Length); + } + } + + public PauseProgressBar() + { + RelativeSizeAxes = Axes.X; + Height = 60; + + Children = new Drawable[] + { + new PauseProgressGraph + { RelativeSizeAxes = Axes.X, - Origin = Anchor.BottomLeft, - Anchor = Anchor.BottomLeft, - Width = 0, - Height = 60, - Children = new Drawable[] - { - new Container - { - RelativeSizeAxes = Axes.Both, - Origin = Anchor.BottomLeft, - Anchor = Anchor.BottomLeft, - Masking = true, - Children = new Drawable[] - { - new Container - { - Origin = Anchor.BottomLeft, - Anchor = Anchor.BottomLeft, - RelativeSizeAxes = Axes.X, - Height = 5, - Masking = true, - EdgeEffect = new EdgeEffect - { - Type = EdgeEffectType.Glow, - Colour = glowColour, - Radius = 5 - }, - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - Colour = fillColour - } - } - } - } - }, - new Container - { - Origin = Anchor.BottomRight, - Anchor = Anchor.BottomRight, - Width = 2, - Height = 35, - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - Colour = Color4.White - }, - new Container - { - Origin = Anchor.BottomCentre, - Anchor = Anchor.TopCentre, - Width = 14, - Height = 25, - CornerRadius = 5, - Masking = true, - Children = new Drawable[] - { - new Box - { - RelativeSizeAxes = Axes.Both, - Colour = Color4.White - } - } - } - } - } - } - } + Origin = Anchor.BottomCentre, + Anchor = Anchor.BottomCentre, + Height = 35, + Margin = new MarginPadding + { + Bottom = 5 + } + }, + new Container + { + Origin = Anchor.BottomRight, + Anchor = Anchor.BottomRight, + RelativeSizeAxes = Axes.X, + Height = 5, + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = Color4.Black, + Alpha = 0.5f + } + } + }, + fill = new Container + { + RelativeSizeAxes = Axes.X, + Origin = Anchor.BottomLeft, + Anchor = Anchor.BottomLeft, + Width = 0, + Height = 60, + Children = new Drawable[] + { + new Container + { + RelativeSizeAxes = Axes.Both, + Origin = Anchor.BottomLeft, + Anchor = Anchor.BottomLeft, + Masking = true, + Children = new Drawable[] + { + new Container + { + Origin = Anchor.BottomLeft, + Anchor = Anchor.BottomLeft, + RelativeSizeAxes = Axes.X, + Height = 5, + Masking = true, + EdgeEffect = new EdgeEffect + { + Type = EdgeEffectType.Glow, + Colour = glowColour, + Radius = 5 + }, + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = fillColour + } + } + } + } + }, + new Container + { + Origin = Anchor.BottomRight, + Anchor = Anchor.BottomRight, + Width = 2, + Height = 35, + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = Color4.White + }, + new Container + { + Origin = Anchor.BottomCentre, + Anchor = Anchor.TopCentre, + Width = 14, + Height = 25, + CornerRadius = 5, + Masking = true, + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = Color4.White + } + } + } + } + } + } + } }; - } - } -} + } + } +} diff --git a/osu.Game/Overlays/Pause/PauseProgressGraph.cs b/osu.Game/Overlays/Pause/PauseProgressGraph.cs index fab9f37923..afe69ae370 100644 --- a/osu.Game/Overlays/Pause/PauseProgressGraph.cs +++ b/osu.Game/Overlays/Pause/PauseProgressGraph.cs @@ -1,9 +1,9 @@ using osu.Framework.Graphics.Containers; -namespace osu.Game.Overlays.Pause -{ - public class PauseProgressGraph : Container +namespace osu.Game.Overlays.Pause +{ + public class PauseProgressGraph : Container { - // TODO: Implement the pause progress graph - } -} + // TODO: Implement the pause progress graph + } +} diff --git a/osu.Game/Overlays/Pause/ResumeButton.cs b/osu.Game/Overlays/Pause/ResumeButton.cs index 216a852993..c6e4e3384d 100644 --- a/osu.Game/Overlays/Pause/ResumeButton.cs +++ b/osu.Game/Overlays/Pause/ResumeButton.cs @@ -1,22 +1,22 @@ -using osu.Framework.Allocation; -using osu.Framework.Audio; -using osu.Game.Graphics; - -namespace osu.Game.Overlays.Pause -{ - public class ResumeButton : PauseButton - { - [BackgroundDependencyLoader] - private void load(AudioManager audio, OsuColour colours) - { - ButtonColour = colours.Green; - SampleHover = audio.Sample.Get(@"Menu/menuclick"); - SampleClick = audio.Sample.Get(@"Menu/menuback"); - } - - public ResumeButton() +using osu.Framework.Allocation; +using osu.Framework.Audio; +using osu.Game.Graphics; + +namespace osu.Game.Overlays.Pause +{ + public class ResumeButton : PauseButton + { + [BackgroundDependencyLoader] + private void load(AudioManager audio, OsuColour colours) { - Text = @"Continue"; - } - } -} + ButtonColour = colours.Green; + SampleHover = audio.Sample.Get(@"Menu/menuclick"); + SampleClick = audio.Sample.Get(@"Menu/menuback"); + } + + public ResumeButton() + { + Text = @"Continue"; + } + } +} From 50bd80cb0c3366e98217a94b15574887f518874e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 7 Feb 2017 13:59:30 +0900 Subject: [PATCH 13/46] Update and standardise license headers. --- osu-framework | 2 +- osu.Desktop.VisualTests/Platform/TestStorage.cs | 4 ++-- osu.Desktop.VisualTests/Program.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseOptions.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs | 5 ++++- osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCasePlayer.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs | 4 ++-- osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs | 4 ++-- osu.Desktop.VisualTests/VisualTestGame.cs | 4 ++-- osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs | 4 ++-- osu.Desktop/OsuGameDesktop.cs | 5 ++++- osu.Desktop/Program.cs | 4 ++-- osu.Game.Modes.Catch/CatchRuleset.cs | 4 ++-- osu.Game.Modes.Catch/Objects/CatchBaseHit.cs | 4 ++-- osu.Game.Modes.Catch/Objects/CatchConverter.cs | 4 ++-- osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs | 4 ++-- osu.Game.Modes.Catch/Objects/Droplet.cs | 4 ++-- osu.Game.Modes.Catch/Objects/Fruit.cs | 4 ++-- osu.Game.Modes.Catch/Properties/AssemblyInfo.cs | 4 ++-- osu.Game.Modes.Catch/UI/CatchComboCounter.cs | 4 ++-- osu.Game.Modes.Catch/UI/CatchHitRenderer.cs | 4 ++-- osu.Game.Modes.Catch/UI/CatchPlayfield.cs | 4 ++-- osu.Game.Modes.Mania/ManiaRuleset.cs | 4 ++-- osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs | 4 ++-- osu.Game.Modes.Mania/Objects/HoldNote.cs | 4 ++-- osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs | 4 ++-- osu.Game.Modes.Mania/Objects/ManiaConverter.cs | 4 ++-- osu.Game.Modes.Mania/Objects/Note.cs | 4 ++-- osu.Game.Modes.Mania/Properties/AssemblyInfo.cs | 4 ++-- osu.Game.Modes.Mania/UI/ManiaComboCounter.cs | 4 ++-- osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs | 4 ++-- osu.Game.Modes.Mania/UI/ManiaPlayfield.cs | 4 ++-- osu.Game.Modes.Osu/Objects/BezierApproximator.cs | 4 ++-- osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs | 4 ++-- .../Objects/Drawables/Pieces/ApproachCircle.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBouncer.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Drawables/Pieces/Triangles.cs | 4 ++-- osu.Game.Modes.Osu/Objects/HitCircle.cs | 4 ++-- osu.Game.Modes.Osu/Objects/OsuHitObject.cs | 4 ++-- osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs | 4 ++-- osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Slider.cs | 4 ++-- osu.Game.Modes.Osu/Objects/SliderCurve.cs | 4 ++-- osu.Game.Modes.Osu/Objects/Spinner.cs | 4 ++-- osu.Game.Modes.Osu/OsuRuleset.cs | 4 ++-- osu.Game.Modes.Osu/OsuScore.cs | 4 ++-- osu.Game.Modes.Osu/OsuScoreProcessor.cs | 4 ++-- osu.Game.Modes.Osu/Properties/AssemblyInfo.cs | 4 ++-- osu.Game.Modes.Osu/UI/OsuComboCounter.cs | 4 ++-- osu.Game.Modes.Osu/UI/OsuHitRenderer.cs | 4 ++-- osu.Game.Modes.Osu/UI/OsuPlayfield.cs | 4 ++-- osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs | 4 ++-- osu.Game.Modes.Osu/packages.config | 1 + osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs | 4 ++-- osu.Game.Modes.Taiko/Objects/TaikoBaseHit.cs | 4 ++-- osu.Game.Modes.Taiko/Objects/TaikoConverter.cs | 4 ++-- osu.Game.Modes.Taiko/Properties/AssemblyInfo.cs | 4 ++-- osu.Game.Modes.Taiko/TaikoRuleset.cs | 4 ++-- osu.Game.Modes.Taiko/UI/TaikoComboCounter.cs | 4 ++-- osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs | 4 ++-- osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs | 4 ++-- osu.Game/Beatmaps/Beatmap.cs | 4 ++-- osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs | 4 ++-- osu.Game/Beatmaps/Drawables/BeatmapGroup.cs | 4 ++-- osu.Game/Beatmaps/Drawables/BeatmapPanel.cs | 4 ++-- osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs | 4 ++-- osu.Game/Beatmaps/Drawables/DifficultyIcon.cs | 4 ++-- osu.Game/Beatmaps/Drawables/Panel.cs | 4 ++-- osu.Game/Beatmaps/Events/EventType.cs | 4 ++-- osu.Game/Beatmaps/Formats/BeatmapDecoder.cs | 4 ++-- osu.Game/Beatmaps/Formats/ConstructableBeatmapDecoder.cs | 4 ++-- osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs | 4 ++-- osu.Game/Beatmaps/IO/ArchiveReader.cs | 4 ++-- osu.Game/Beatmaps/IO/OszArchiveReader.cs | 4 ++-- osu.Game/Beatmaps/Samples/HitSampleInfo.cs | 4 ++-- osu.Game/Beatmaps/Samples/SampleBank.cs | 4 ++-- osu.Game/Beatmaps/Samples/SampleInfo.cs | 4 ++-- osu.Game/Beatmaps/Samples/SampleSet.cs | 4 ++-- osu.Game/Beatmaps/Samples/SampleType.cs | 4 ++-- osu.Game/Beatmaps/Timing/ControlPoint.cs | 4 ++-- osu.Game/Beatmaps/Timing/SampleChange.cs | 4 ++-- osu.Game/Beatmaps/Timing/TimingChange.cs | 4 ++-- osu.Game/Beatmaps/WorkingBeatmap.cs | 4 ++-- osu.Game/Configuration/ConfineMouseMode.cs | 5 ++++- osu.Game/Configuration/OsuConfigManager.cs | 4 ++-- osu.Game/Configuration/ProgressBarType.cs | 5 ++++- osu.Game/Configuration/RankingType.cs | 5 ++++- osu.Game/Configuration/ReleaseStream.cs | 5 ++++- osu.Game/Configuration/ScoreMeterType.cs | 5 ++++- osu.Game/Configuration/ScreenshotFormat.cs | 5 ++++- osu.Game/Database/BaseDifficulty.cs | 4 ++-- osu.Game/Database/BeatmapDatabase.cs | 4 ++-- osu.Game/Database/BeatmapInfo.cs | 4 ++-- osu.Game/Database/BeatmapMetadata.cs | 4 ++-- osu.Game/Database/BeatmapSetInfo.cs | 4 ++-- osu.Game/Graphics/Backgrounds/Background.cs | 4 ++-- osu.Game/Graphics/Backgrounds/Triangles.cs | 4 ++-- osu.Game/Graphics/Containers/ParallaxContainer.cs | 4 ++-- osu.Game/Graphics/Cursor/CursorTrail.cs | 4 ++-- osu.Game/Graphics/Cursor/OsuCursorContainer.cs | 4 ++-- osu.Game/Graphics/OsuColour.cs | 5 ++++- osu.Game/Graphics/Processing/RatioAdjust.cs | 4 ++-- osu.Game/Graphics/Sprites/OsuSpriteText.cs | 4 ++-- osu.Game/Graphics/TextAwesome.cs | 4 ++-- osu.Game/Graphics/UserInterface/BackButton.cs | 4 ++-- osu.Game/Graphics/UserInterface/LoadingAnimation.cs | 4 ++-- osu.Game/Graphics/UserInterface/Nub.cs | 4 ++-- osu.Game/Graphics/UserInterface/OsuButton.cs | 4 ++-- osu.Game/Graphics/UserInterface/OsuCheckbox.cs | 4 ++-- osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs | 4 ++-- osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs | 4 ++-- osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs | 4 ++-- osu.Game/Graphics/UserInterface/OsuSliderBar.cs | 4 ++-- osu.Game/Graphics/UserInterface/OsuTextBox.cs | 4 ++-- osu.Game/Graphics/UserInterface/PercentageCounter.cs | 4 ++-- osu.Game/Graphics/UserInterface/RollingCounter.cs | 4 ++-- osu.Game/Graphics/UserInterface/ScoreCounter.cs | 4 ++-- osu.Game/Graphics/UserInterface/StarCounter.cs | 4 ++-- osu.Game/Graphics/UserInterface/TwoLayerButton.cs | 4 ++-- osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs | 4 ++-- .../Graphics/UserInterface/Volume/VolumeControlReceptor.cs | 4 ++-- osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs | 4 ++-- osu.Game/IPC/BeatmapImporter.cs | 4 ++-- osu.Game/Input/GlobalHotkeys.cs | 4 ++-- osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs | 4 ++-- osu.Game/Modes/Objects/HitObject.cs | 4 ++-- osu.Game/Modes/Objects/HitObjectConverter.cs | 4 ++-- osu.Game/Modes/Objects/HitObjectParser.cs | 4 ++-- osu.Game/Modes/PlayMode.cs | 4 ++-- osu.Game/Modes/Ruleset.cs | 4 ++-- osu.Game/Modes/Score.cs | 4 ++-- osu.Game/Modes/ScoreProcesssor.cs | 4 ++-- osu.Game/Modes/UI/ComboCounter.cs | 4 ++-- osu.Game/Modes/UI/ComboResultCounter.cs | 4 ++-- osu.Game/Modes/UI/HealthDisplay.cs | 5 ++++- osu.Game/Modes/UI/HitRenderer.cs | 4 ++-- osu.Game/Modes/UI/Playfield.cs | 4 ++-- osu.Game/Modes/UI/ScoreOverlay.cs | 4 ++-- osu.Game/Online/API/APIAccess.cs | 4 ++-- osu.Game/Online/API/APIRequest.cs | 4 ++-- osu.Game/Online/API/IOnlineComponent.cs | 4 ++-- osu.Game/Online/API/OAuth.cs | 4 ++-- osu.Game/Online/API/OAuthToken.cs | 4 ++-- osu.Game/Online/API/Requests/GetMessagesRequest.cs | 4 ++-- osu.Game/Online/API/Requests/GetUserRequest.cs | 4 ++-- osu.Game/Online/API/Requests/ListChannels.cs | 4 ++-- osu.Game/Online/API/SecurePassword.cs | 4 ++-- osu.Game/Online/Chat/Channel.cs | 4 ++-- osu.Game/Online/Chat/Drawables/ChannelDisplay.cs | 4 ++-- osu.Game/Online/Chat/Drawables/ChatLine.cs | 4 ++-- osu.Game/Online/Chat/Message.cs | 4 ++-- osu.Game/Online/User.cs | 4 ++-- osu.Game/OsuGame.cs | 4 ++-- osu.Game/OsuGameBase.cs | 4 ++-- osu.Game/Overlays/ChatOverlay.cs | 4 ++-- osu.Game/Overlays/DragBar.cs | 4 ++-- osu.Game/Overlays/LoginOverlay.cs | 4 ++-- osu.Game/Overlays/MusicController.cs | 4 ++-- osu.Game/Overlays/Options/OptionDropDown.cs | 5 ++++- osu.Game/Overlays/Options/OptionLabel.cs | 4 ++-- osu.Game/Overlays/Options/OptionSlider.cs | 4 ++-- osu.Game/Overlays/Options/OptionTextBox.cs | 4 ++-- osu.Game/Overlays/Options/OptionsSection.cs | 4 ++-- osu.Game/Overlays/Options/OptionsSubsection.cs | 4 ++-- .../Overlays/Options/Sections/Audio/AudioDevicesOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/Audio/VolumeOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/AudioSection.cs | 4 ++-- osu.Game/Overlays/Options/Sections/EditorSection.cs | 4 ++-- .../Overlays/Options/Sections/Gameplay/GeneralOptions.cs | 4 ++-- .../Overlays/Options/Sections/Gameplay/SongSelectOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/GameplaySection.cs | 4 ++-- .../Overlays/Options/Sections/General/LanguageOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/General/LoginOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/GeneralSection.cs | 4 ++-- osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs | 4 ++-- .../Overlays/Options/Sections/Graphics/MainMenuOptions.cs | 4 ++-- .../Overlays/Options/Sections/Graphics/RendererOptions.cs | 4 ++-- .../Options/Sections/Graphics/SongSelectGraphicsOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/GraphicsSection.cs | 4 ++-- osu.Game/Overlays/Options/Sections/Input/KeyboardOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs | 4 ++-- .../Overlays/Options/Sections/Input/OtherInputOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/InputSection.cs | 4 ++-- osu.Game/Overlays/Options/Sections/MaintenanceSection.cs | 4 ++-- .../Overlays/Options/Sections/Online/InGameChatOptions.cs | 4 ++-- .../Overlays/Options/Sections/Online/IntegrationOptions.cs | 4 ++-- .../Overlays/Options/Sections/Online/NotificationsOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/Online/PrivacyOptions.cs | 4 ++-- osu.Game/Overlays/Options/Sections/OnlineSection.cs | 4 ++-- osu.Game/Overlays/Options/Sections/SkinSection.cs | 4 ++-- osu.Game/Overlays/Options/Sidebar.cs | 4 ++-- osu.Game/Overlays/Options/SidebarButton.cs | 4 ++-- osu.Game/Overlays/OptionsOverlay.cs | 4 ++-- osu.Game/Overlays/Pause/PauseButton.cs | 4 ++-- osu.Game/Overlays/Pause/PauseOverlay.cs | 5 ++++- osu.Game/Overlays/Pause/PauseProgressBar.cs | 5 ++++- osu.Game/Overlays/Pause/PauseProgressGraph.cs | 5 ++++- osu.Game/Overlays/Pause/QuitButton.cs | 5 ++++- osu.Game/Overlays/Pause/ResumeButton.cs | 5 ++++- osu.Game/Overlays/Pause/RetryButton.cs | 5 ++++- osu.Game/Overlays/Toolbar/Toolbar.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarButton.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarModeButton.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarUserArea.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarUserButton.cs | 4 ++-- osu.Game/Properties/AssemblyInfo.cs | 4 ++-- osu.Game/Screens/BackgroundMode.cs | 4 ++-- osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs | 4 ++-- osu.Game/Screens/Backgrounds/BackgroundModeCustom.cs | 4 ++-- osu.Game/Screens/Backgrounds/BackgroundModeDefault.cs | 4 ++-- osu.Game/Screens/Backgrounds/BackgroundModeEmpty.cs | 4 ++-- osu.Game/Screens/Charts/ChartInfo.cs | 4 ++-- osu.Game/Screens/Charts/ChartListing.cs | 4 ++-- osu.Game/Screens/Direct/OnlineListing.cs | 4 ++-- osu.Game/Screens/Edit/Editor.cs | 4 ++-- osu.Game/Screens/GameModeWhiteBox.cs | 4 ++-- osu.Game/Screens/Menu/Button.cs | 4 ++-- osu.Game/Screens/Menu/ButtonSystem.cs | 4 ++-- osu.Game/Screens/Menu/FlowContainerWithOrigin.cs | 4 ++-- osu.Game/Screens/Menu/Intro.cs | 4 ++-- osu.Game/Screens/Menu/MainMenu.cs | 4 ++-- osu.Game/Screens/Menu/MenuVisualisation.cs | 4 ++-- osu.Game/Screens/Menu/OsuLogo.cs | 4 ++-- osu.Game/Screens/Multiplayer/Lobby.cs | 4 ++-- osu.Game/Screens/Multiplayer/Match.cs | 4 ++-- osu.Game/Screens/Multiplayer/MatchCreate.cs | 4 ++-- osu.Game/Screens/OsuGameMode.cs | 4 ++-- osu.Game/Screens/Play/FailDialog.cs | 4 ++-- osu.Game/Screens/Play/KeyCounter.cs | 4 ++-- osu.Game/Screens/Play/KeyCounterCollection.cs | 4 ++-- osu.Game/Screens/Play/KeyCounterKeyboard.cs | 4 ++-- osu.Game/Screens/Play/KeyCounterMouse.cs | 4 ++-- osu.Game/Screens/Play/ModSelect.cs | 4 ++-- osu.Game/Screens/Play/Player.cs | 4 ++-- osu.Game/Screens/Play/PlayerInputManager.cs | 5 ++++- osu.Game/Screens/Play/SkipButton.cs | 4 ++-- osu.Game/Screens/Ranking/Results.cs | 4 ++-- osu.Game/Screens/Select/BeatmapInfoWedge.cs | 4 ++-- osu.Game/Screens/Select/CarouselContainer.cs | 4 ++-- osu.Game/Screens/Select/EditSongSelect.cs | 4 ++-- osu.Game/Screens/Select/FilterControl.cs | 5 ++++- osu.Game/Screens/Select/Footer.cs | 4 ++-- osu.Game/Screens/Select/FooterButton.cs | 4 ++-- osu.Game/Screens/Select/MatchSongSelect.cs | 4 ++-- osu.Game/Screens/Select/PlaySongSelect.cs | 4 ++-- osu.Game/Screens/Select/SearchTextBox.cs | 5 ++++- osu.Game/Users/User.cs | 4 ++-- osu.licenseheader | 4 ++-- 276 files changed, 590 insertions(+), 529 deletions(-) diff --git a/osu-framework b/osu-framework index 5906ae1e16..66af3bcb3c 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 5906ae1e16802fd4e04a6e9ceefdbd1a95de8b9e +Subproject commit 66af3bcb3cb6dc3e38f94553bd2c1bb81746eabc diff --git a/osu.Desktop.VisualTests/Platform/TestStorage.cs b/osu.Desktop.VisualTests/Platform/TestStorage.cs index ecf12d233a..c09c955f9c 100644 --- a/osu.Desktop.VisualTests/Platform/TestStorage.cs +++ b/osu.Desktop.VisualTests/Platform/TestStorage.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; using osu.Framework.Desktop.Platform; diff --git a/osu.Desktop.VisualTests/Program.cs b/osu.Desktop.VisualTests/Program.cs index a6205fe6ba..df54297812 100644 --- a/osu.Desktop.VisualTests/Program.cs +++ b/osu.Desktop.VisualTests/Program.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using osu.Framework.Desktop; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs index 9e8083310c..0e83010caf 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using System.Diagnostics; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index d77e2d135b..4338a1ac77 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using osu.Framework.GameModes.Testing; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs index d6112d7024..7ca51f8af3 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; using osu.Framework.GameModes.Testing; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs index 1f25da39c1..c5ecdfa936 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.GameModes.Testing; using osu.Framework.Graphics; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs index 6579e8109c..511f8568db 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.GameModes.Testing; using osu.Framework.Graphics.Colour; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs index 833cefc3d8..900321d0c1 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.GameModes.Testing; using osu.Framework.Graphics; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseOptions.cs b/osu.Desktop.VisualTests/Tests/TestCaseOptions.cs index 781c3034fa..1fed512fc5 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseOptions.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseOptions.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.GameModes.Testing; using osu.Framework.Graphics; diff --git a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs index 23c7cc45cf..81825681f9 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePauseOverlay.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using System; using OpenTK.Graphics; using osu.Framework.Logging; using osu.Framework.Graphics; diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs index 0e45d58774..47fac4d339 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using osu.Desktop.VisualTests.Platform; diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs index b55d341100..c6baa0a4f0 100644 --- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs +++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using osu.Framework.Allocation; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs index f74e3471cd..891e888d76 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using osu.Framework.GameModes.Testing; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs b/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs index e783ec775a..301cf3dd8f 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using osu.Framework.GameModes.Testing; diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs b/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs index 2edb6d6a55..2fbc9c811d 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.GameModes.Testing; using osu.Framework.Graphics.Colour; diff --git a/osu.Desktop.VisualTests/VisualTestGame.cs b/osu.Desktop.VisualTests/VisualTestGame.cs index fb949cf1ea..7489559c98 100644 --- a/osu.Desktop.VisualTests/VisualTestGame.cs +++ b/osu.Desktop.VisualTests/VisualTestGame.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework; using osu.Framework.GameModes.Testing; diff --git a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs index b7f727f8fd..9b699a3d76 100644 --- a/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs +++ b/osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.IO; diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index e5abb763a7..5edeffd448 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -1,4 +1,7 @@ -using osu.Game; +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Game; using System; using System.Collections.Generic; using System.Linq; diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs index 62100f9b36..f9a4c94b8d 100644 --- a/osu.Desktop/Program.cs +++ b/osu.Desktop/Program.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.IO; diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs index cebc7967c4..f81c88ae02 100644 --- a/osu.Game.Modes.Catch/CatchRuleset.cs +++ b/osu.Game.Modes.Catch/CatchRuleset.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using osu.Game.Graphics; diff --git a/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs b/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs index 67e94e7000..79769710a7 100644 --- a/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs +++ b/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Objects; diff --git a/osu.Game.Modes.Catch/Objects/CatchConverter.cs b/osu.Game.Modes.Catch/Objects/CatchConverter.cs index 0f48de2793..588cf4780a 100644 --- a/osu.Game.Modes.Catch/Objects/CatchConverter.cs +++ b/osu.Game.Modes.Catch/Objects/CatchConverter.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using osu.Game.Modes.Objects; diff --git a/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs index dd9cfbcc6b..654352811a 100644 --- a/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs +++ b/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/osu.Game.Modes.Catch/Objects/Droplet.cs b/osu.Game.Modes.Catch/Objects/Droplet.cs index 42ad809e2c..dd58fec7e8 100644 --- a/osu.Game.Modes.Catch/Objects/Droplet.cs +++ b/osu.Game.Modes.Catch/Objects/Droplet.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Modes.Catch.Objects { diff --git a/osu.Game.Modes.Catch/Objects/Fruit.cs b/osu.Game.Modes.Catch/Objects/Fruit.cs index f1cb3d6db4..15363a7031 100644 --- a/osu.Game.Modes.Catch/Objects/Fruit.cs +++ b/osu.Game.Modes.Catch/Objects/Fruit.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Modes.Catch.Objects { diff --git a/osu.Game.Modes.Catch/Properties/AssemblyInfo.cs b/osu.Game.Modes.Catch/Properties/AssemblyInfo.cs index 6dbfcd99a8..39475be046 100644 --- a/osu.Game.Modes.Catch/Properties/AssemblyInfo.cs +++ b/osu.Game.Modes.Catch/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Reflection; using System.Runtime.CompilerServices; diff --git a/osu.Game.Modes.Catch/UI/CatchComboCounter.cs b/osu.Game.Modes.Catch/UI/CatchComboCounter.cs index ac30beba18..e0a07dc295 100644 --- a/osu.Game.Modes.Catch/UI/CatchComboCounter.cs +++ b/osu.Game.Modes.Catch/UI/CatchComboCounter.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Osu.UI; using OpenTK.Graphics; diff --git a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs index 9e1d2af571..0d06ce29a7 100644 --- a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs +++ b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Catch.Objects; using osu.Game.Modes.Objects; diff --git a/osu.Game.Modes.Catch/UI/CatchPlayfield.cs b/osu.Game.Modes.Catch/UI/CatchPlayfield.cs index 4b6b2ab531..cf69ab4fe2 100644 --- a/osu.Game.Modes.Catch/UI/CatchPlayfield.cs +++ b/osu.Game.Modes.Catch/UI/CatchPlayfield.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs index be444adb99..012caf387e 100644 --- a/osu.Game.Modes.Mania/ManiaRuleset.cs +++ b/osu.Game.Modes.Mania/ManiaRuleset.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using osu.Game.Graphics; diff --git a/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs b/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs index 1d81ab16f8..0ee2543930 100644 --- a/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs +++ b/osu.Game.Modes.Mania/Objects/Drawable/DrawableNote.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Allocation; using osu.Framework.Graphics.Sprites; diff --git a/osu.Game.Modes.Mania/Objects/HoldNote.cs b/osu.Game.Modes.Mania/Objects/HoldNote.cs index 7c12593d79..3d95e11118 100644 --- a/osu.Game.Modes.Mania/Objects/HoldNote.cs +++ b/osu.Game.Modes.Mania/Objects/HoldNote.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Modes.Mania.Objects { diff --git a/osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs b/osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs index efb2c20959..8b3afc82d9 100644 --- a/osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs +++ b/osu.Game.Modes.Mania/Objects/ManiaBaseHit.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Objects; diff --git a/osu.Game.Modes.Mania/Objects/ManiaConverter.cs b/osu.Game.Modes.Mania/Objects/ManiaConverter.cs index 93c3f1a9e4..6c95c73b38 100644 --- a/osu.Game.Modes.Mania/Objects/ManiaConverter.cs +++ b/osu.Game.Modes.Mania/Objects/ManiaConverter.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game.Modes.Mania/Objects/Note.cs b/osu.Game.Modes.Mania/Objects/Note.cs index ec1ee270e3..c36ed8cf7e 100644 --- a/osu.Game.Modes.Mania/Objects/Note.cs +++ b/osu.Game.Modes.Mania/Objects/Note.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Modes.Mania.Objects { diff --git a/osu.Game.Modes.Mania/Properties/AssemblyInfo.cs b/osu.Game.Modes.Mania/Properties/AssemblyInfo.cs index 57e1595715..c7c7296d60 100644 --- a/osu.Game.Modes.Mania/Properties/AssemblyInfo.cs +++ b/osu.Game.Modes.Mania/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Reflection; using System.Runtime.CompilerServices; diff --git a/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs b/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs index 2be3f7df2e..ac437baa2a 100644 --- a/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs +++ b/osu.Game.Modes.Mania/UI/ManiaComboCounter.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; diff --git a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs index a13e829e07..59c79f0d03 100644 --- a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs +++ b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Mania.Objects; using osu.Game.Modes.Objects; diff --git a/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs b/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs index bd905cef9a..2772b09e16 100644 --- a/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs +++ b/osu.Game.Modes.Mania/UI/ManiaPlayfield.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; diff --git a/osu.Game.Modes.Osu/Objects/BezierApproximator.cs b/osu.Game.Modes.Osu/Objects/BezierApproximator.cs index f03e1c0738..73fb342492 100644 --- a/osu.Game.Modes.Osu/Objects/BezierApproximator.cs +++ b/osu.Game.Modes.Osu/Objects/BezierApproximator.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using OpenTK; diff --git a/osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs b/osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs index b8f84ed510..d9b77db891 100644 --- a/osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs +++ b/osu.Game.Modes.Osu/Objects/CircularArcApproximator.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using OpenTK; using osu.Framework.MathUtils; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs index dab9aa1144..3708f429ac 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.ComponentModel; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs index 9e1fb93cd5..0c7ca11672 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.ComponentModel; using osu.Game.Modes.Objects; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs index 0626873afc..ba67572b72 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using osu.Framework.Graphics; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs index cdb087f6c3..51a944cb18 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Extensions; using osu.Framework.Graphics; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs index 0e2ec50d89..f1ab062848 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ApproachCircle.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using osu.Framework.Allocation; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs index f28b4ba7eb..f7477fb6f0 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/CirclePiece.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using osu.Framework.Allocation; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs index 0b7d30cafc..ae382519df 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs index a4d69de4eb..cb60977dab 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/FlashPiece.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs index 569deb8ce6..1a16eae48c 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/GlowPiece.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs index 6478027335..8a594ed95c 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs index 379c384144..3a98973b15 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/RingPiece.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs index caae9b11f2..d5ad94b5bd 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBall.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs index 2849976c09..173bf2c060 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBody.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBouncer.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBouncer.cs index 47a345bdc3..e13f8626a5 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBouncer.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SliderBouncer.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/Triangles.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/Triangles.cs index 2025934e71..42b53606ef 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/Triangles.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/Triangles.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Allocation; using osu.Framework.Graphics; diff --git a/osu.Game.Modes.Osu/Objects/HitCircle.cs b/osu.Game.Modes.Osu/Objects/HitCircle.cs index 6d06cc5f89..aa45ac7fb9 100644 --- a/osu.Game.Modes.Osu/Objects/HitCircle.cs +++ b/osu.Game.Modes.Osu/Objects/HitCircle.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Modes.Osu.Objects { diff --git a/osu.Game.Modes.Osu/Objects/OsuHitObject.cs b/osu.Game.Modes.Osu/Objects/OsuHitObject.cs index 12fdf1a344..6791b9dc2c 100644 --- a/osu.Game.Modes.Osu/Objects/OsuHitObject.cs +++ b/osu.Game.Modes.Osu/Objects/OsuHitObject.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using osu.Game.Beatmaps.Samples; diff --git a/osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs b/osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs index 23a6b3f5e9..5a8828ea3f 100644 --- a/osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs +++ b/osu.Game.Modes.Osu/Objects/OsuHitObjectConverter.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using osu.Game.Modes.Objects; diff --git a/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs b/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs index 43755b3996..0f65ae598a 100644 --- a/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs +++ b/osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game.Modes.Osu/Objects/Slider.cs b/osu.Game.Modes.Osu/Objects/Slider.cs index 27210eec10..2269aa0ce5 100644 --- a/osu.Game.Modes.Osu/Objects/Slider.cs +++ b/osu.Game.Modes.Osu/Objects/Slider.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Beatmaps; using OpenTK; diff --git a/osu.Game.Modes.Osu/Objects/SliderCurve.cs b/osu.Game.Modes.Osu/Objects/SliderCurve.cs index 1c2ef3a604..9c035ac010 100644 --- a/osu.Game.Modes.Osu/Objects/SliderCurve.cs +++ b/osu.Game.Modes.Osu/Objects/SliderCurve.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using OpenTK; diff --git a/osu.Game.Modes.Osu/Objects/Spinner.cs b/osu.Game.Modes.Osu/Objects/Spinner.cs index a0452e5b1e..ea6f1b53f2 100644 --- a/osu.Game.Modes.Osu/Objects/Spinner.cs +++ b/osu.Game.Modes.Osu/Objects/Spinner.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE namespace osu.Game.Modes.Osu.Objects { diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs index 76e3bacb65..0276f5f90f 100644 --- a/osu.Game.Modes.Osu/OsuRuleset.cs +++ b/osu.Game.Modes.Osu/OsuRuleset.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Collections.Generic; using System.Linq; diff --git a/osu.Game.Modes.Osu/OsuScore.cs b/osu.Game.Modes.Osu/OsuScore.cs index d08f75fecf..2a3c9a866f 100644 --- a/osu.Game.Modes.Osu/OsuScore.cs +++ b/osu.Game.Modes.Osu/OsuScore.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; using System.Collections.Generic; diff --git a/osu.Game.Modes.Osu/OsuScoreProcessor.cs b/osu.Game.Modes.Osu/OsuScoreProcessor.cs index 6059949fad..8a9f7d6b2e 100644 --- a/osu.Game.Modes.Osu/OsuScoreProcessor.cs +++ b/osu.Game.Modes.Osu/OsuScoreProcessor.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Osu.Objects.Drawables; diff --git a/osu.Game.Modes.Osu/Properties/AssemblyInfo.cs b/osu.Game.Modes.Osu/Properties/AssemblyInfo.cs index 81c3d6298a..2991947d85 100644 --- a/osu.Game.Modes.Osu/Properties/AssemblyInfo.cs +++ b/osu.Game.Modes.Osu/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Reflection; using System.Runtime.CompilerServices; diff --git a/osu.Game.Modes.Osu/UI/OsuComboCounter.cs b/osu.Game.Modes.Osu/UI/OsuComboCounter.cs index 8a6e9a30e2..0d27fe502a 100644 --- a/osu.Game.Modes.Osu/UI/OsuComboCounter.cs +++ b/osu.Game.Modes.Osu/UI/OsuComboCounter.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.UI; using OpenTK; diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs index 02e7521c4f..fdaab87d55 100644 --- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs +++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Game.Modes.Objects; using osu.Game.Modes.Objects.Drawables; diff --git a/osu.Game.Modes.Osu/UI/OsuPlayfield.cs b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs index 9cf873dabf..49c6869189 100644 --- a/osu.Game.Modes.Osu/UI/OsuPlayfield.cs +++ b/osu.Game.Modes.Osu/UI/OsuPlayfield.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; diff --git a/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs b/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs index 445cdd35a3..ba996be326 100644 --- a/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs +++ b/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs @@ -1,5 +1,5 @@ -//Copyright (c) 2007-2016 ppy Pty Ltd . -//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using osu.Framework.Graphics; using osu.Game.Graphics.UserInterface; diff --git a/osu.Game.Modes.Osu/packages.config b/osu.Game.Modes.Osu/packages.config index 10451d4b70..591ae8cd7f 100644 --- a/osu.Game.Modes.Osu/packages.config +++ b/osu.Game.Modes.Osu/packages.config @@ -1,4 +1,5 @@  +