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

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
This commit is contained in:
Thomas Müller
2017-03-01 18:05:58 +01:00
parent 03889e6ca6 b3a411d8c3
commit d46e68b36b
54 changed files with 321 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -256,7 +256,7 @@ namespace osu.Game.Overlays.Notifications
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load()
{
Size = new Vector2(6, 15);