mirror of
https://github.com/ppy/osu.git
synced 2024-11-06 06:57:39 +08:00
Merge branch 'master' into tournament-seeding-screen
This commit is contained in:
commit
dadf151e7c
2
.github/ISSUE_TEMPLATE/01-bug-issues.md
vendored
2
.github/ISSUE_TEMPLATE/01-bug-issues.md
vendored
@ -9,6 +9,8 @@ about: Issues regarding encountered bugs.
|
||||
**osu!lazer version:**
|
||||
|
||||
**Logs:**
|
||||
<!--
|
||||
*please attach logs here, which are located at:*
|
||||
- `%AppData%/osu/logs` *(on Windows),*
|
||||
- `~/.local/share/osu/logs` *(on Linux & macOS).*
|
||||
-->
|
||||
|
@ -80,7 +80,7 @@ namespace osu.Game.Tournament.Screens.Ladder
|
||||
break;
|
||||
|
||||
case NotifyCollectionChangedAction.Remove:
|
||||
foreach (var p in args.NewItems.Cast<TournamentMatch>())
|
||||
foreach (var p in args.OldItems.Cast<TournamentMatch>())
|
||||
{
|
||||
foreach (var d in MatchesContainer.Where(d => d.Match == p))
|
||||
d.Expire();
|
||||
|
@ -104,32 +104,32 @@ namespace osu.Game.Graphics
|
||||
public enum FontWeight
|
||||
{
|
||||
/// <summary>
|
||||
/// equivalent to weight 300
|
||||
/// Equivalent to weight 300.
|
||||
/// </summary>
|
||||
Light = 300,
|
||||
|
||||
/// <summary>
|
||||
/// equivalent to weight 400
|
||||
/// Equivalent to weight 400.
|
||||
/// </summary>
|
||||
Regular = 400,
|
||||
|
||||
/// <summary>
|
||||
/// equivalent to weight 500
|
||||
/// Equivalent to weight 500.
|
||||
/// </summary>
|
||||
Medium = 500,
|
||||
|
||||
/// <summary>
|
||||
/// equivalent to weight 600
|
||||
/// Equivalent to weight 600.
|
||||
/// </summary>
|
||||
SemiBold = 600,
|
||||
|
||||
/// <summary>
|
||||
/// equivalent to weight 700
|
||||
/// Equivalent to weight 700.
|
||||
/// </summary>
|
||||
Bold = 700,
|
||||
|
||||
/// <summary>
|
||||
/// equivalent to weight 900
|
||||
/// Equivalent to weight 900.
|
||||
/// </summary>
|
||||
Black = 900
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user