diff --git a/osu.Desktop.Tests/app.config b/osu.Desktop.Tests/app.config index 44ccc4b77a..b9af3fdc80 100644 --- a/osu.Desktop.Tests/app.config +++ b/osu.Desktop.Tests/app.config @@ -1,4 +1,8 @@  + diff --git a/osu.Desktop.Tests/osu.Desktop.Tests.csproj b/osu.Desktop.Tests/osu.Desktop.Tests.csproj index 2c88548c3e..7a5bd59074 100644 --- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj +++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj @@ -100,6 +100,9 @@ + + osu.licenseheader + diff --git a/osu.Desktop.Tests/packages.config b/osu.Desktop.Tests/packages.config index 05b53c019c..76b22db9d4 100644 --- a/osu.Desktop.Tests/packages.config +++ b/osu.Desktop.Tests/packages.config @@ -1,4 +1,8 @@  + diff --git a/osu.Desktop.VisualTests/OpenTK.dll.config b/osu.Desktop.VisualTests/OpenTK.dll.config index 1dd145f0c4..627e9f6009 100644 --- a/osu.Desktop.VisualTests/OpenTK.dll.config +++ b/osu.Desktop.VisualTests/OpenTK.dll.config @@ -1,8 +1,7 @@ - diff --git a/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs b/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs index 77b313f4ad..0b84eeaa30 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs @@ -26,8 +26,6 @@ namespace osu.Desktop.VisualTests.Tests progressingNotifications.Clear(); - AddInternal(new BackgroundModeDefault() { Depth = 10 }); - Content.Add(manager = new NotificationManager { Anchor = Anchor.TopRight, diff --git a/osu.Desktop.VisualTests/VisualTestGame.cs b/osu.Desktop.VisualTests/VisualTestGame.cs index 952de4ab26..51fcffce57 100644 --- a/osu.Desktop.VisualTests/VisualTestGame.cs +++ b/osu.Desktop.VisualTests/VisualTestGame.cs @@ -11,6 +11,7 @@ using System.Reflection; using System.IO; using System.Collections.Generic; using osu.Framework.Allocation; +using osu.Game.Screens.Backgrounds; namespace osu.Desktop.VisualTests { @@ -20,6 +21,8 @@ namespace osu.Desktop.VisualTests { base.LoadComplete(); + (new BackgroundModeDefault() { Depth = 10 }).Preload(this, AddInternal); + // Have to construct this here, rather than in the constructor, because // we depend on some dependencies to be loaded within OsuGameBase.load(). Add(new TestBrowser()); diff --git a/osu.Desktop.VisualTests/app.config b/osu.Desktop.VisualTests/app.config index 9bad888bf3..b9af3fdc80 100644 --- a/osu.Desktop.VisualTests/app.config +++ b/osu.Desktop.VisualTests/app.config @@ -1,9 +1,8 @@  - diff --git a/osu.Desktop.VisualTests/packages.config b/osu.Desktop.VisualTests/packages.config index 75affafd35..82404c059e 100644 --- a/osu.Desktop.VisualTests/packages.config +++ b/osu.Desktop.VisualTests/packages.config @@ -1,6 +1,6 @@  diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs index f941401f43..e3cffc1804 100644 --- a/osu.Desktop/Overlays/VersionManager.cs +++ b/osu.Desktop/Overlays/VersionManager.cs @@ -1,4 +1,7 @@ -using osu.Framework.Allocation; +// 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; using osu.Framework.Graphics.Containers; using osu.Game.Graphics.Sprites; @@ -6,6 +9,10 @@ using osu.Game.Overlays; using osu.Game.Overlays.Notifications; using Squirrel; using System.Reflection; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Textures; +using osu.Game.Graphics; +using OpenTK; namespace osu.Desktop.Overlays { @@ -14,20 +21,65 @@ namespace osu.Desktop.Overlays private UpdateManager updateManager; private NotificationManager notification; + protected override bool HideOnEscape => false; + + public override bool HandleInput => false; + [BackgroundDependencyLoader] - private void load(NotificationManager notification) + private void load(NotificationManager notification, OsuColour colours, TextureStore textures) { this.notification = notification; AutoSizeAxes = Axes.Both; Anchor = Anchor.BottomCentre; Origin = Anchor.BottomCentre; + Alpha = 0; var asm = Assembly.GetEntryAssembly().GetName(); - Add(new OsuSpriteText + Children = new Drawable[] { - Text = $@"osu!lazer v{asm.Version}" - }); + new FlowContainer + { + AutoSizeAxes = Axes.Both, + Direction = FlowDirections.Vertical, + Children = new Drawable[] + { + new FlowContainer + { + AutoSizeAxes = Axes.Both, + Direction = FlowDirections.Horizontal, + Anchor = Anchor.TopCentre, + Origin = Anchor.TopCentre, + Spacing = new Vector2(5), + Children = new Drawable[] + { + new OsuSpriteText + { + Font = @"Exo2.0-Bold", + Text = $@"osu!lazer" + }, + new OsuSpriteText + { + Text = $@"{asm.Version.Major}.{asm.Version.Minor}.{asm.Version.Build}" + }, + } + }, + new OsuSpriteText + { + Anchor = Anchor.TopCentre, + Origin = Anchor.TopCentre, + TextSize = 12, + Colour = colours.Yellow, + Font = @"Venera", + Text = $@"Development Build" + }, + new Sprite + { + Texture = textures.Get(@"Menu/dev-build-footer"), + }, + } + } + }; updateChecker(); } @@ -75,6 +127,7 @@ namespace osu.Desktop.Overlays protected override void PopIn() { + FadeIn(1000); } protected override void PopOut() diff --git a/osu.Desktop/Properties/AssemblyInfo.cs b/osu.Desktop/Properties/AssemblyInfo.cs index 1f234d2993..8784aa1ee0 100644 --- a/osu.Desktop/Properties/AssemblyInfo.cs +++ b/osu.Desktop/Properties/AssemblyInfo.cs @@ -1,4 +1,7 @@ -using System.Reflection; +// 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; using System.Runtime.InteropServices; diff --git a/osu.Desktop/app.config b/osu.Desktop/app.config index 44ccc4b77a..b9af3fdc80 100644 --- a/osu.Desktop/app.config +++ b/osu.Desktop/app.config @@ -1,4 +1,8 @@  + diff --git a/osu.Desktop/packages.config b/osu.Desktop/packages.config index 8d1361bd0a..5fc8e82bfd 100644 --- a/osu.Desktop/packages.config +++ b/osu.Desktop/packages.config @@ -1,4 +1,8 @@  + diff --git a/osu.Game.Modes.Catch/OpenTK.dll.config b/osu.Game.Modes.Catch/OpenTK.dll.config index 1dd145f0c4..627e9f6009 100644 --- a/osu.Game.Modes.Catch/OpenTK.dll.config +++ b/osu.Game.Modes.Catch/OpenTK.dll.config @@ -1,8 +1,7 @@ - diff --git a/osu.Game.Modes.Catch/packages.config b/osu.Game.Modes.Catch/packages.config index 3c9e7e3fdc..d53e65896a 100644 --- a/osu.Game.Modes.Catch/packages.config +++ b/osu.Game.Modes.Catch/packages.config @@ -1,9 +1,8 @@  - \ No newline at end of file diff --git a/osu.Game.Modes.Mania/OpenTK.dll.config b/osu.Game.Modes.Mania/OpenTK.dll.config index 1dd145f0c4..627e9f6009 100644 --- a/osu.Game.Modes.Mania/OpenTK.dll.config +++ b/osu.Game.Modes.Mania/OpenTK.dll.config @@ -1,8 +1,7 @@ - diff --git a/osu.Game.Modes.Mania/app.config b/osu.Game.Modes.Mania/app.config index 9bad888bf3..b9af3fdc80 100644 --- a/osu.Game.Modes.Mania/app.config +++ b/osu.Game.Modes.Mania/app.config @@ -1,9 +1,8 @@  - diff --git a/osu.Game.Modes.Mania/packages.config b/osu.Game.Modes.Mania/packages.config index 3c9e7e3fdc..d53e65896a 100644 --- a/osu.Game.Modes.Mania/packages.config +++ b/osu.Game.Modes.Mania/packages.config @@ -1,9 +1,8 @@  - \ No newline at end of file diff --git a/osu.Game.Modes.Osu/OpenTK.dll.config b/osu.Game.Modes.Osu/OpenTK.dll.config index 1dd145f0c4..627e9f6009 100644 --- a/osu.Game.Modes.Osu/OpenTK.dll.config +++ b/osu.Game.Modes.Osu/OpenTK.dll.config @@ -1,8 +1,7 @@ - diff --git a/osu.Game.Modes.Osu/app.config b/osu.Game.Modes.Osu/app.config index c42343ec69..d9da887349 100644 --- a/osu.Game.Modes.Osu/app.config +++ b/osu.Game.Modes.Osu/app.config @@ -1,9 +1,8 @@ - diff --git a/osu.Game.Modes.Osu/packages.config b/osu.Game.Modes.Osu/packages.config index 591ae8cd7f..d06cd15869 100644 --- a/osu.Game.Modes.Osu/packages.config +++ b/osu.Game.Modes.Osu/packages.config @@ -1,10 +1,8 @@  - - \ No newline at end of file diff --git a/osu.Game.Modes.Taiko/OpenTK.dll.config b/osu.Game.Modes.Taiko/OpenTK.dll.config index 1dd145f0c4..627e9f6009 100644 --- a/osu.Game.Modes.Taiko/OpenTK.dll.config +++ b/osu.Game.Modes.Taiko/OpenTK.dll.config @@ -1,8 +1,7 @@ - diff --git a/osu.Game.Modes.Taiko/packages.config b/osu.Game.Modes.Taiko/packages.config index 3c9e7e3fdc..d53e65896a 100644 --- a/osu.Game.Modes.Taiko/packages.config +++ b/osu.Game.Modes.Taiko/packages.config @@ -1,9 +1,8 @@  - \ No newline at end of file diff --git a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs index 9a988d6eff..6613b5c370 100644 --- a/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs +++ b/osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.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 System.IO; using NUnit.Framework; using OpenTK; diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index 165181a332..6a162a4ab9 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.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 System.Collections.Generic; using System.IO; using System.Linq; diff --git a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs index 037c0185b8..3d706a8026 100644 --- a/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.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 System.IO; using NUnit.Framework; using osu.Game.Beatmaps.IO; diff --git a/osu.Game.Tests/OpenTK.dll.config b/osu.Game.Tests/OpenTK.dll.config index 5620e3d9e2..627e9f6009 100644 --- a/osu.Game.Tests/OpenTK.dll.config +++ b/osu.Game.Tests/OpenTK.dll.config @@ -1,3 +1,7 @@ + diff --git a/osu.Game.Tests/Resources/Resource.cs b/osu.Game.Tests/Resources/Resource.cs index 21945ac504..6c66b6818b 100644 --- a/osu.Game.Tests/Resources/Resource.cs +++ b/osu.Game.Tests/Resources/Resource.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 System.IO; using System.Reflection; diff --git a/osu.Game.Tests/app.config b/osu.Game.Tests/app.config index 44ccc4b77a..b9af3fdc80 100644 --- a/osu.Game.Tests/app.config +++ b/osu.Game.Tests/app.config @@ -1,4 +1,8 @@  + diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index c6f0c6fa55..f555615f09 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -55,6 +55,9 @@ + + osu.licenseheader + diff --git a/osu.Game.Tests/packages.config b/osu.Game.Tests/packages.config index f9151f1eaa..b9f1a2c8cd 100644 --- a/osu.Game.Tests/packages.config +++ b/osu.Game.Tests/packages.config @@ -1,4 +1,8 @@  + diff --git a/osu.Game/Graphics/Backgrounds/Background.cs b/osu.Game/Graphics/Backgrounds/Background.cs index 55c37cb71d..5ff63ead2a 100644 --- a/osu.Game/Graphics/Backgrounds/Background.cs +++ b/osu.Game/Graphics/Backgrounds/Background.cs @@ -20,6 +20,8 @@ namespace osu.Game.Graphics.Backgrounds public Background(string textureName = @"") { + CacheDrawnFrameBuffer = true; + this.textureName = textureName; RelativeSizeAxes = Axes.Both; Depth = float.MaxValue; diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs index 13fbbb16e0..bc8be25035 100644 --- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs +++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs @@ -1,5 +1,5 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE +// 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/Overlays/Options/OptionEnumDropDown.cs b/osu.Game/Overlays/Options/OptionEnumDropDown.cs index 9b9f5acc5c..044e704d3a 100644 --- a/osu.Game/Overlays/Options/OptionEnumDropDown.cs +++ b/osu.Game/Overlays/Options/OptionEnumDropDown.cs @@ -1,4 +1,15 @@ -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 osu.Framework.Configuration; +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.Graphics.Sprites; +using osu.Game.Graphics.UserInterface; using System.Reflection; using System.ComponentModel; using System.Collections.Generic; diff --git a/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs index 65b50542ce..e7b0ba1566 100644 --- a/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs +++ b/osu.Game/Screens/Backgrounds/BackgroundModeBeatmap.cs @@ -78,7 +78,6 @@ namespace osu.Game.Screens.Backgrounds public BeatmapBackground(WorkingBeatmap beatmap) { this.beatmap = beatmap; - CacheDrawnFrameBuffer = true; } [BackgroundDependencyLoader] diff --git a/osu.Game/packages.config b/osu.Game/packages.config index 98448d402f..0249d173ac 100644 --- a/osu.Game/packages.config +++ b/osu.Game/packages.config @@ -1,9 +1,8 @@  - diff --git a/osu.licenseheader b/osu.licenseheader index 94a06a7e14..30ea2f9ad9 100644 --- a/osu.licenseheader +++ b/osu.licenseheader @@ -4,6 +4,6 @@ extensions: .xml .config .xsd +--> \ No newline at end of file