From f41006def7ee4aa1b3308a7186348145b3140ee4 Mon Sep 17 00:00:00 2001 From: tgi74000 Date: Tue, 24 Apr 2018 21:17:04 +0200 Subject: [PATCH 01/10] Set game ruleset to the score ruleset --- osu.Game/OsuGame.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 3852580c49..d443ed36ae 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -201,6 +201,8 @@ namespace osu.Game return; } + Ruleset.Value = s.Ruleset; + Beatmap.Value = BeatmapManager.GetWorkingBeatmap(s.Beatmap); Beatmap.Value.Mods.Value = s.Mods; From ad8ba37ee370bd81464756c71d40e546af7ea4f4 Mon Sep 17 00:00:00 2001 From: Nobbele <4ppleCracker@gmail.com> Date: Thu, 26 Apr 2018 12:57:24 +0200 Subject: [PATCH 02/10] Updated UserStatus.cs to make more sense(UNTESTED) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Untested code, on my ipad in school so i can’t compile the code or check for refrences to stuff Modding, playing multiplayer/singleplayer, Busy, etc are all done when user is online so they may just be a class of type UserStatusOnline(used to be UserStatusAvailable but since available and online are basically the same i just made available be online). I don’t know how PM’s are handled but i assume that the client recieves the PM and then decides what to do based on your status. By doing this you can interupt the user with the message if typeof(status) != typeof(UserStatusBusy), making multiplaying, solo game, etc not interupt the user, but when typeof(status) == typeof(UserStatusBusy) show a less intrusive message box to not interupt the user --- osu.Game/Users/UserStatus.cs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/osu.Game/Users/UserStatus.cs b/osu.Game/Users/UserStatus.cs index 22bc9ed1a0..1584605166 100644 --- a/osu.Game/Users/UserStatus.cs +++ b/osu.Game/Users/UserStatus.cs @@ -12,12 +12,13 @@ namespace osu.Game.Users public abstract Color4 GetAppropriateColour(OsuColour colours); } - public abstract class UserStatusAvailable : UserStatus + public class UserStatusOnline : UserStatus { + public override string Message => @"Online"; public override Color4 GetAppropriateColour(OsuColour colours) => colours.BlueDarker; } - public abstract class UserStatusBusy : UserStatus + public abstract class UserStatusBusy : UserStatusOnline { public override Color4 GetAppropriateColour(OsuColour colours) => colours.YellowDark; } @@ -28,17 +29,12 @@ namespace osu.Game.Users public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray7; } - public class UserStatusOnline : UserStatusAvailable - { - public override string Message => @"Online"; - } - - public class UserStatusSpectating : UserStatusAvailable + public class UserStatusSpectating : UserStatusOnline { public override string Message => @"Spectating a game"; } - public class UserStatusInLobby : UserStatusAvailable + public class UserStatusInLobby : UserStatusOnline { public override string Message => @"in Multiplayer Lobby"; } @@ -53,13 +49,13 @@ namespace osu.Game.Users public override string Message => @"Multiplaying"; } - public class UserStatusModding : UserStatus + public class UserStatusModding : UserStatusOnline { public override string Message => @"Modding a map"; public override Color4 GetAppropriateColour(OsuColour colours) => colours.PurpleDark; } - public class UserStatusDoNotDisturb : UserStatus + public class UserStatusDoNotDisturb : UserStatusBusy { public override string Message => @"Do not disturb"; public override Color4 GetAppropriateColour(OsuColour colours) => colours.RedDark; From 8de05450c4eb99c6d993d193b3c87ede35301a62 Mon Sep 17 00:00:00 2001 From: TocoToucan Date: Sun, 29 Apr 2018 17:53:38 +0300 Subject: [PATCH 03/10] Cleanup UserProfileOverlay during PopOut --- osu.Game/Overlays/UserProfileOverlay.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs index a4dd0c9ec3..d8f858b95e 100644 --- a/osu.Game/Overlays/UserProfileOverlay.cs +++ b/osu.Game/Overlays/UserProfileOverlay.cs @@ -71,6 +71,7 @@ namespace osu.Game.Overlays { base.PopOut(); FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.Out); + cleanup(); } public void ShowUser(long userId) @@ -83,9 +84,7 @@ namespace osu.Game.Overlays public void ShowUser(User user, bool fetchOnline = true) { - userReq?.Cancel(); - Clear(); - lastSection = null; + cleanup(); sections = new ProfileSection[] { @@ -165,6 +164,13 @@ namespace osu.Game.Overlays sectionsContainer.ScrollToTop(); } + private void cleanup() + { + userReq?.Cancel(); + Clear(); + lastSection = null; + } + private void userLoadComplete(User user) { Header.User = user; From 06c6f55995993a72842f15f775afec30556e7d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adonais=20Romero=20Gonz=C3=A1lez?= Date: Mon, 30 Apr 2018 00:43:32 -0700 Subject: [PATCH 04/10] Apply offset to end times on legacy converter --- osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs | 5 +++-- .../Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs index 366b4f163f..655355913c 100644 --- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs +++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs @@ -373,17 +373,18 @@ namespace osu.Game.Beatmaps.Formats if (parser == null) parser = new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(); - var obj = parser.Parse(line); + var obj = parser.Parse(line, getOffsetTime()); if (obj != null) { - obj.StartTime = getOffsetTime(obj.StartTime); beatmap.HitObjects.Add(obj); } } private int getOffsetTime(int time) => time + (ApplyOffsets ? offset : 0); + private double getOffsetTime() => ApplyOffsets ? offset : 0; + private double getOffsetTime(double time) => time + (ApplyOffsets ? offset : 0); } } diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs index 95abc4edb3..9edd0f1f34 100644 --- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs +++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs @@ -19,6 +19,11 @@ namespace osu.Game.Rulesets.Objects.Legacy public abstract class ConvertHitObjectParser : HitObjectParser { public override HitObject Parse(string text) + { + return Parse(text, 0); + } + + public HitObject Parse(string text, double offset) { try { @@ -146,7 +151,7 @@ namespace osu.Game.Rulesets.Objects.Legacy } else if ((type & ConvertHitObjectType.Spinner) > 0) { - result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture)); + result = CreateSpinner(new Vector2(512, 384) / 2, Convert.ToDouble(split[5], CultureInfo.InvariantCulture) + offset); if (split.Length > 6) readCustomSampleBanks(split[6], bankInfo); @@ -164,13 +169,13 @@ namespace osu.Game.Rulesets.Objects.Legacy readCustomSampleBanks(string.Join(":", ss.Skip(1)), bankInfo); } - result = CreateHold(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, endTime); + result = CreateHold(new Vector2(int.Parse(split[0]), int.Parse(split[1])), combo, endTime + offset); } if (result == null) throw new InvalidOperationException($@"Unknown hit object type {type}."); - result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture); + result.StartTime = Convert.ToDouble(split[2], CultureInfo.InvariantCulture) + offset; result.Samples = convertSoundType(soundType, bankInfo); return result; From 9f9447d44149ff81e269ff5d2962589e8e57ec5a Mon Sep 17 00:00:00 2001 From: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com> Date: Wed, 2 May 2018 14:02:49 +0800 Subject: [PATCH 05/10] Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed" This reverts commit 67793845b092f67ccce29f8d99f87c8db33270a1. --- osu.Game/Overlays/UserProfileOverlay.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs index d8f858b95e..a4dd0c9ec3 100644 --- a/osu.Game/Overlays/UserProfileOverlay.cs +++ b/osu.Game/Overlays/UserProfileOverlay.cs @@ -71,7 +71,6 @@ namespace osu.Game.Overlays { base.PopOut(); FadeEdgeEffectTo(0, WaveContainer.DISAPPEAR_DURATION, Easing.Out); - cleanup(); } public void ShowUser(long userId) @@ -84,7 +83,9 @@ namespace osu.Game.Overlays public void ShowUser(User user, bool fetchOnline = true) { - cleanup(); + userReq?.Cancel(); + Clear(); + lastSection = null; sections = new ProfileSection[] { @@ -164,13 +165,6 @@ namespace osu.Game.Overlays sectionsContainer.ScrollToTop(); } - private void cleanup() - { - userReq?.Cancel(); - Clear(); - lastSection = null; - } - private void userLoadComplete(User user) { Header.User = user; From 8b99a3b8e6c4836af090293d633d6863d5a6a3aa Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 2 May 2018 15:07:18 +0800 Subject: [PATCH 06/10] Add squirrel dependency on net471 --- osu.Desktop.Deploy/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index 16bbf90cd4..594be45210 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -115,7 +115,7 @@ namespace osu.Desktop.Deploy checkReleaseFiles(); write("Running squirrel build..."); - runCommand(squirrelPath, $"--releasify {stagingPath}\\{nupkgFilename(version)} --setupIcon {iconPath} --icon {iconPath} {codeSigningCmd} --no-msi"); + runCommand(squirrelPath, $"--releasify {stagingPath}\\{nupkgFilename(version)} --framework-version=net471 --setupIcon {iconPath} --icon {iconPath} {codeSigningCmd} --no-msi"); //prune again to clean up before upload. pruneReleases(); From b37acf75102f166244c53751bf9fbf257ca6a4b2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 2 May 2018 16:23:42 +0800 Subject: [PATCH 07/10] Update squirrel version for net471 prereq support --- osu.Desktop.Deploy/osu.Desktop.Deploy.csproj | 2 +- osu.Desktop/osu.Desktop.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj index a97b8197b4..063fb89918 100644 --- a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj +++ b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj @@ -12,7 +12,7 @@ - + diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index 27bc3f7597..fa378cf19e 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -31,7 +31,7 @@ - + From e92166b40f59bfd4142662266f9aea8d98d2a586 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 2 May 2018 16:33:48 +0800 Subject: [PATCH 08/10] Update csproj defaults --- osu.Desktop/osu.Desktop.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index fa378cf19e..3d64cab84e 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -1,4 +1,4 @@ - + net471;netcoreapp2.0 @@ -10,8 +10,8 @@ osu!lazer osu!lazer lazer.ico - 0.0.0.0 - 0.0.0.0 + 0.0.0 + 0.0.0 $(DefineConstants);NET_FRAMEWORK @@ -36,4 +36,4 @@ - \ No newline at end of file + From 6ecb09431f17301dc690efcfcd3f891d5cd074c7 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 2 May 2018 16:37:44 +0800 Subject: [PATCH 09/10] Update squirrel path --- osu.Desktop.Deploy/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index 594be45210..a1c2a8aef2 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -19,7 +19,7 @@ namespace osu.Desktop.Deploy { private static string packages => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".nuget", "packages"); private static string nugetPath => Path.Combine(packages, @"nuget.commandline\4.5.1\tools\NuGet.exe"); - private static string squirrelPath => Path.Combine(packages, @"squirrel.windows\1.7.8\tools\Squirrel.exe"); + private static string squirrelPath => Path.Combine(packages, @"squirrel.windows\1.8.0\tools\Squirrel.exe"); private const string msbuild_path = @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"; public static string StagingFolder = ConfigurationManager.AppSettings["StagingFolder"]; From c2979a5c48de6b07318bd8c91ecf89d0922d6326 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 7 May 2018 22:08:45 +0900 Subject: [PATCH 10/10] Update CodeFileSanity --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 15484e4c68..69bc762f4c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ install: - cmd: git submodule update --init --recursive --depth=5 - cmd: choco install resharper-clt -y - cmd: choco install nvika -y - - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.4/CodeFileSanity.exe + - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.5/CodeFileSanity.exe before_build: - cmd: CodeFileSanity.exe - cmd: nuget restore -verbosity quiet