Merge remote-tracking branch 'origin/master' into general-fixes

2025-01-29 02:12:57 +08:00 · 2017-03-31 10:57:45 +09:00 · 2017-03-31 10:57:45 +09:00 · e335b16ee3
commit e335b16ee3
parent bae0ac4901 e57de373a8
11 changed files with 48 additions and 12 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4d131fd0d997bee313de3fa33a45900637570ff0
+Subproject commit 269a1fd192c573d558a5ab0ff990a8b462947287
--- a/osu.Desktop/OpenTK.dll.config
+++ b/osu.Desktop/OpenTK.dll.config
@ -0,0 +1,29 @@
+<!--
+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"/>
+  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
+  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
+  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
+  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
+  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
+  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
+  <!-- XQuartz compatibility (X11 on Mac) -->
+  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
+  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
+  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
+  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
+  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
+  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
+</configuration>
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@ -123,7 +123,10 @@
      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
      <Private>True</Private>
@ -150,6 +153,7 @@
    <None Include="..\osu.licenseheader">
      <Link>osu.licenseheader</Link>
    </None>
+    <None Include="OpenTK.dll.config" />
    <None Include="osu!.res" />
    <None Include="packages.config" />
    <None Include="Properties\app.manifest" />
--- a/osu.Desktop/packages.config
+++ b/osu.Desktop/packages.config
@ -7,6 +7,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
  <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
  <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
  <package id="Splat" version="2.0.0" targetFramework="net45" />
  <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
 </packages>
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
@ -36,7 +36,8 @@ namespace osu.Game.Beatmaps.Drawables
                new DelayedLoadContainer
                {
                    RelativeSizeAxes = Axes.Both,
-                    TimeBeforeLoad = 100,
+                    TimeBeforeLoad = 300,
+                    FinishedLoading = d => d.FadeInFromZero(400, EasingTypes.Out),
                    Children = new[]
                    {
                        new PanelBackground(beatmap)
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@ -199,7 +199,7 @@ namespace osu.Game
            {
                Depth = -3,
                OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); },
-                OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },
+                OnPlayModeChange = m => PlayMode.Value = m,
            }).LoadAsync(this, t =>
            {
                PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); };
--- a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
@ -65,14 +65,13 @@ namespace osu.Game.Overlays.Toolbar

            foreach (PlayMode m in Ruleset.PlayModes)
            {
-                var localMode = m;
                modeButtons.Add(new ToolbarModeButton
                {
                    Mode = m,
                    Action = delegate
                    {
-                        SetGameMode(localMode);
-                        OnPlayModeChange?.Invoke(localMode);
+                        SetGameMode(m);
+                        OnPlayModeChange?.Invoke(m);
                    }
                });
            }
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@ -181,7 +181,8 @@ namespace osu.Game.Screens.Select
        {
            if (!IsLoaded) return;

-            criteria = newCriteria ?? criteria ?? new FilterCriteria();
+            if (newCriteria != null)
+                criteria = newCriteria;

            Action perform = delegate
            {
@ -202,6 +203,8 @@ namespace osu.Game.Screens.Select

                if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden)
                    SelectNext();
+                else
+                    selectGroup(selectedGroup);
            };

            filterTask?.Cancel();
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@ -175,6 +175,7 @@ namespace osu.Game.Screens.Select

            if (osu != null)
                playMode.BindTo(osu.PlayMode);
+            playMode.ValueChanged += (s, e) => FilterChanged?.Invoke(CreateCriteria());
        }

        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@ -276,7 +276,7 @@ namespace osu.Game.Screens.Select
            initialAddSetsTask.Cancel();
        }

-        private void playMode_ValueChanged(object sender, EventArgs e) => carousel.Filter();
+        private void playMode_ValueChanged(object sender, EventArgs e) => Beatmap.PreferredPlayMode = playMode;

        private void changeBackground(WorkingBeatmap beatmap)
        {
--- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
+++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
@ -298,9 +298,7 @@ namespace osu.Game.Screens.Tournament
        private void speedTo(float value, double duration = 0, EasingTypes easing = EasingTypes.None)
        {
            DelayReset();
-
-            UpdateTransformsOfType(typeof(TransformScrollSpeed));
-            TransformFloatTo(speed, value, duration, easing, new TransformScrollSpeed());
+            TransformTo(speed, value, duration, easing, new TransformScrollSpeed());
        }

        private enum ScrollState