pkgs/osu-lazer: Rebase patches
This commit is contained in:
parent
ce62b43bc8
commit
7f5bf88fd7
|
@ -1,4 +1,4 @@
|
||||||
From 07c5ef34d1f7870de87df93751ee155d88c4fa61 Mon Sep 17 00:00:00 2001
|
From 0dbe256bc02cfa70a3a6df13e9446aa032e751c3 Mon Sep 17 00:00:00 2001
|
||||||
From: Simon Bruder <simon@sbruder.de>
|
From: Simon Bruder <simon@sbruder.de>
|
||||||
Date: Fri, 9 Apr 2021 12:01:42 +0200
|
Date: Fri, 9 Apr 2021 12:01:42 +0200
|
||||||
Subject: [PATCH 1/2] Disable deployed build
|
Subject: [PATCH 1/2] Disable deployed build
|
||||||
|
@ -9,10 +9,10 @@ It shows warnings at startup which prolong the time it takes to start.
|
||||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
|
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
|
||||||
index e1c7b67a8c..b290b0a01a 100644
|
index 406819cbd2..d1261ad6fc 100644
|
||||||
--- a/osu.Game/OsuGameBase.cs
|
--- a/osu.Game/OsuGameBase.cs
|
||||||
+++ b/osu.Game/OsuGameBase.cs
|
+++ b/osu.Game/OsuGameBase.cs
|
||||||
@@ -127,15 +127,12 @@ public class OsuGameBase : Framework.Game, ICanAcceptFiles
|
@@ -128,15 +128,12 @@ public class OsuGameBase : Framework.Game, ICanAcceptFiles
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string VersionHash { get; private set; }
|
public string VersionHash { get; private set; }
|
||||||
|
|
||||||
|
|
|
@ -1,22 +1,26 @@
|
||||||
From 60d879b1c35381fae221a4d38aba0959fda09e4a Mon Sep 17 00:00:00 2001
|
From 9ccd841f86745f54ebe7d51eec591552a1e58f56 Mon Sep 17 00:00:00 2001
|
||||||
From: Simon Bruder <simon@sbruder.de>
|
From: Simon Bruder <simon@sbruder.de>
|
||||||
Date: Fri, 9 Apr 2021 12:02:44 +0200
|
Date: Fri, 9 Apr 2021 12:02:44 +0200
|
||||||
Subject: [PATCH 2/2] Remove random song button from footer
|
Subject: [PATCH 2/2] Remove random song button from footer
|
||||||
|
|
||||||
I often click it accidentally.
|
I often click it accidentally.
|
||||||
---
|
---
|
||||||
osu.Game/Screens/Select/SongSelect.cs | 1 -
|
osu.Game/Screens/Select/SongSelect.cs | 5 -----
|
||||||
1 file changed, 1 deletion(-)
|
1 file changed, 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
|
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
|
||||||
index b7f7c40539..efcabed687 100644
|
index 215700d87c..2259238df8 100644
|
||||||
--- a/osu.Game/Screens/Select/SongSelect.cs
|
--- a/osu.Game/Screens/Select/SongSelect.cs
|
||||||
+++ b/osu.Game/Screens/Select/SongSelect.cs
|
+++ b/osu.Game/Screens/Select/SongSelect.cs
|
||||||
@@ -307,7 +307,6 @@ private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, S
|
@@ -307,11 +307,6 @@ private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, S
|
||||||
protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
|
protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
|
||||||
{
|
{
|
||||||
(new FooterButtonMods { Current = Mods }, ModSelect),
|
(new FooterButtonMods { Current = Mods }, ModSelect),
|
||||||
- (new FooterButtonRandom { Action = triggerRandom }, null),
|
- (new FooterButtonRandom
|
||||||
|
- {
|
||||||
|
- NextRandom = () => Carousel.SelectNextRandom(),
|
||||||
|
- PreviousRandom = Carousel.SelectPreviousRandom
|
||||||
|
- }, null),
|
||||||
(new FooterButtonOptions(), BeatmapOptions)
|
(new FooterButtonOptions(), BeatmapOptions)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue