h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 08:02:55 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into toggle-multiplayer-leaderboard-with-hud

Browse Source
This commit is contained in:
Dan Balasescu 2021-08-06 19:36:19 +09:00 committed by GitHub
commit 8f014650df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Online.Multiplayer
public string Password { get; set; } = string.Empty;
[Key(8)]
public MatchType MatchType { get; set; }
public MatchType MatchType { get; set; } = MatchType.HeadToHead;
public bool Equals(MultiplayerRoomSettings other)
=> BeatmapID == other.BeatmapID

2
osu.Game/Screens/OnlinePlay/Match/Components/MatchTypePicker.cs
View File

@ -30,8 +30,6 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
AddItem(MatchType.HeadToHead);
AddItem(MatchType.TeamVersus);
// TODO: remove after osu-web is updated to set the correct default type.
AddItem(MatchType.Playlists);
}
private class GameTypePickerItem : DisableableTabItem