Merge pull request #357 from peppy/general-fixes

General fixes.

osu.Desktop.Tests/app.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

osu.Desktop.Tests/osu.Desktop.Tests.csproj

@@ -100,6 +100,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>

osu.Desktop.Tests/packages.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="NUnit" version="3.5.0" targetFramework="net45" />

osu.Desktop.VisualTests/OpenTK.dll.config

@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

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,

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());

osu.Desktop.VisualTests/app.config

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

osu.Desktop.VisualTests/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>

osu.Desktop/Overlays/VersionManager.cs

@@ -1,4 +1,7 @@
-using osu.Framework.Allocation;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// 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()

osu.Desktop/Properties/AssemblyInfo.cs

@@ -1,4 +1,7 @@
-using System.Reflection;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

osu.Desktop/app.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

osu.Desktop/packages.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <packages>
   <package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />

osu.Game.Modes.Catch/OpenTK.dll.config

@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

osu.Game.Modes.Catch/packages.config

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
   <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
 </packages>

osu.Game.Modes.Mania/OpenTK.dll.config

@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

osu.Game.Modes.Mania/app.config

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

osu.Game.Modes.Mania/packages.config

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
   <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
 </packages>

osu.Game.Modes.Osu/OpenTK.dll.config

@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

osu.Game.Modes.Osu/app.config

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

osu.Game.Modes.Osu/packages.config

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
   <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net452" />
 </packages>

osu.Game.Modes.Taiko/OpenTK.dll.config

@@ -1,8 +1,7 @@
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

osu.Game.Modes.Taiko/packages.config

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
   <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
 </packages>

osu.Game.Tests/Beatmaps/Formats/OsuLegacyDecoderTest.cs

@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
 using System.IO;
 using NUnit.Framework;
 using OpenTK;

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// 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;

osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs

@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// 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;

osu.Game.Tests/OpenTK.dll.config

@@ -1,3 +1,7 @@
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <configuration>
   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>

osu.Game.Tests/Resources/Resource.cs

@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
 using System.IO;
 using System.Reflection;
 

osu.Game.Tests/app.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

osu.Game.Tests/osu.Game.Tests.csproj

@@ -55,6 +55,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
     <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="OpenTK.dll.config" />

osu.Game.Tests/packages.config

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
 <packages>
   <package id="NUnit" version="3.5.0" targetFramework="net45" />
   <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />

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;

osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs

@@ -1,5 +1,5 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// 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;

osu.Game/Overlays/Options/OptionEnumDropDown.cs

@@ -1,4 +1,15 @@
-using System;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// 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;

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]

osu.Game/packages.config

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
-
 <packages>
   <package id="DotNetZip" version="1.10.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />

osu.licenseheader

@@ -4,6 +4,6 @@
 
 extensions:  .xml .config .xsd
 <!--
-Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->