You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

smoogipooo b50d8733ff Merge remote-tracking branch 'origin/master' into HEAD ... Conflicts: osu.Game.Resources/osu.Game.Resources.csproj		9 years ago
..
Beatmaps	Add test osz file	9 years ago
Fonts	Add Noto (medium) for CJK support.	9 years ago
Properties	Merge remote-tracking branch 'origin/master' into HEAD	9 years ago
Samples	Add hitsounds.	9 years ago
Shaders	Bring CursorTrail shader up to speed with framework.	9 years ago
Textures	Merge remote-tracking branch 'origin/master' into HEAD	9 years ago
Tracks	Add main menu bgm.	9 years ago
osu.Game.Resources.csproj	Merge remote-tracking branch 'origin/master' into HEAD	9 years ago