sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-28 06:38:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into news

Browse Source
This commit is contained in:
Dan Balasescu 2020-07-08 17:16:16 +09:00 committed by GitHub
commit dcc2958e14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
View File

@ -203,13 +203,14 @@ namespace osu.Game.Tournament.Screens.TeamIntro
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = TournamentGame.TEXT_COLOUR, Colour = TournamentGame.ELEMENT_BACKGROUND_COLOUR,
}, },
new TournamentSpriteText new TournamentSpriteText
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Text = seeding.ToString("#,0"), Text = seeding.ToString("#,0"),
Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR
}, },
} }
}, },

3
osu.Game/Input/KeyBindingStore.cs
View File

@ -55,6 +55,9 @@ namespace osu.Game.Input
RulesetID = rulesetId, RulesetID = rulesetId,
Variant = variant Variant = variant
}); });
// required to ensure stable insert order (https://github.com/dotnet/efcore/issues/11686)
usage.Context.SaveChanges();
} }
} }
} }