diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index ca2b1c2bbe..6822b7be51 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -1,40 +1,40 @@ - - - - - net461;netcoreapp2.0 - Exe - AnyCPU - true - ppy Pty Ltd - click the circles. to the beat. - ppy Pty Ltd 2007-2017 - osu! - osu!lazer - osu!lazer - lazer.ico - 0.0.0.0 - 0.0.0.0 - - - $(DefineConstants);NET_FRAMEWORK - - - - - - - - - - - - - - - - - - - + + + + + net461;netcoreapp2.0 + Exe + AnyCPU + true + ppy Pty Ltd + click the circles. to the beat. + ppy Pty Ltd 2007-2017 + osu! + osu!lazer + osu!lazer + lazer.ico + 0.0.0.0 + 0.0.0.0 + + + $(DefineConstants);NET_FRAMEWORK + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj index ce07b8c7ff..6bd96b5d87 100644 --- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj +++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj @@ -1,23 +1,23 @@ - - - - - netstandard2.0 - Library - AnyCPU - true - ppy Pty Ltd - 1.0.0.0 - ppy Pty Ltd 2007-2017 - osu.Game.Rulesets.Catch - catch the fruit. to the beat. - osu.Game.Rulesets.Catch - - - - - - - - + + + + + netstandard2.0 + Library + AnyCPU + true + ppy Pty Ltd + 1.0.0.0 + ppy Pty Ltd 2007-2017 + osu.Game.Rulesets.Catch + catch the fruit. to the beat. + osu.Game.Rulesets.Catch + + + + + + + + \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj index 90d2ad05d4..8092af65ce 100644 --- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj +++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj @@ -1,23 +1,23 @@ - - - - - netstandard2.0 - Library - AnyCPU - true - ppy Pty Ltd - 1.0.0.0 - ppy Pty Ltd 2007-2017 - osu.Game.Rulests.Mania - smash the keys. to the beat. - osu.Game.Rulests.Mania - - - - - - - - + + + + + netstandard2.0 + Library + AnyCPU + true + ppy Pty Ltd + 1.0.0.0 + ppy Pty Ltd 2007-2017 + osu.Game.Rulests.Mania + smash the keys. to the beat. + osu.Game.Rulests.Mania + + + + + + + + \ No newline at end of file diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj index 8cce2de1b4..53d444d0d9 100644 --- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj +++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj @@ -1,23 +1,23 @@ - - - - - netstandard2.0 - Library - AnyCPU - true - ppy Pty Ltd - 1.0.0.0 - ppy Pty Ltd 2007-2017 - osu.Game.Rulesets.Osu - click the circles. to the beat. - osu.Game.Rulesets.Osu - - - - - - - - + + + + + netstandard2.0 + Library + AnyCPU + true + ppy Pty Ltd + 1.0.0.0 + ppy Pty Ltd 2007-2017 + osu.Game.Rulesets.Osu + click the circles. to the beat. + osu.Game.Rulesets.Osu + + + + + + + + \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj index f4672b913e..bcceb03042 100644 --- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj +++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj @@ -1,23 +1,23 @@ - - - - - netstandard2.0 - Library - AnyCPU - true - ppy Pty Ltd - 1.0.0.0 - ppy Pty Ltd 2007-2017 - osu.Game.Rulesets.Taiko - bash the drum. to the beat. - osu.Game.Rulesets.Taiko - - - - - - - - + + + + + netstandard2.0 + Library + AnyCPU + true + ppy Pty Ltd + 1.0.0.0 + ppy Pty Ltd 2007-2017 + osu.Game.Rulesets.Taiko + bash the drum. to the beat. + osu.Game.Rulesets.Taiko + + + + + + + + \ No newline at end of file diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index adc96ae3cd..45a71d600f 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -1,30 +1,30 @@ - - - - - netstandard2.0 - Library - AnyCPU - true - ppy Pty Ltd - 1.0.0.0 - ppy Pty Ltd 2007-2017 - osu.Game.Tests - osu.Game.Tests - - - - - - - - - - - - - - - - + + + + + netstandard2.0 + Library + AnyCPU + true + ppy Pty Ltd + 1.0.0.0 + ppy Pty Ltd 2007-2017 + osu.Game.Tests + osu.Game.Tests + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/osu.Game.props b/osu.Game.props index 61d5bea511..60a5e97944 100644 --- a/osu.Game.props +++ b/osu.Game.props @@ -1,6 +1,10 @@ - - + + + + + 7 + osu.licenseheader diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs index 229d06ef09..df95a5c384 100644 --- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs +++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs @@ -40,7 +40,8 @@ private void updateRelativeChildSize() return; } - timeline.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1); + // Todo: This should be handled more gracefully + timeline.RelativeChildSize = Beatmap.Value.Track.Length == double.PositiveInfinity ? Vector2.One : new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1); } protected void Add(Drawable visualisation) => timeline.Add(visualisation); diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index b8c1e0551c..f763d2527e 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -1,27 +1,27 @@ - - - - - netstandard2.0 - Library - AnyCPU - true - ppy Pty Ltd - 1.0.0.0 - ppy Pty Ltd 2007-2017 - osu.Game - click the circles. to the beat. - osu.Game - - - - - - - - - - - - + + + + + netstandard2.0 + Library + AnyCPU + true + ppy Pty Ltd + 1.0.0.0 + ppy Pty Ltd 2007-2017 + osu.Game + click the circles. to the beat. + osu.Game + + + + + + + + + + + + \ No newline at end of file diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings index fdfbf25144..76929dcbb3 100644 --- a/osu.sln.DotSettings +++ b/osu.sln.DotSettings @@ -34,6 +34,7 @@ HINT WARNING WARNING + HINT WARNING WARNING DO_NOT_SHOW @@ -44,13 +45,16 @@ WARNING ERROR HINT + HINT HINT WARNING WARNING + HINT DO_NOT_SHOW HINT HINT HINT + HINT WARNING WARNING WARNING @@ -149,6 +153,7 @@ WARNING WARNING WARNING + HINT WARNING WARNING HINT