sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tournament-tools

Browse Source 
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
This commit is contained in:
Dean Herbert
2019-02-02 18:29:20 +09:00
parent a7c82c9741 499e06797a
commit 482a01e7ba
1439 changed files with 14749 additions and 7462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Tournament.Screens.Showcase
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
Add(new TournamentLogo());
AddInternal(new TournamentLogo());
}
}
}