sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cache-ruleset-dependencies-for-tests

Browse Source
This commit is contained in:
Dan Balasescu 2020-06-15 19:32:31 +09:00 committed by GitHub
commit dadbcfd9f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
global.json
View File

@ -5,6 +5,6 @@
"version": "3.1.100" "version": "3.1.100"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.Traversal": "2.0.48" "Microsoft.Build.Traversal": "2.0.50"
} }
} }

6
osu.Game/Overlays/BeatmapListing/SearchGenre.cs
View File

@ -20,6 +20,10 @@ namespace osu.Game.Overlays.BeatmapListing
[Description("Hip Hop")] [Description("Hip Hop")]
HipHop = 9, HipHop = 9,
Electronic = 10 Electronic = 10,
Metal = 11,
Classical = 12,
Folk = 13,
Jazz = 14
} }
} }

17
osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
View File

@ -11,8 +11,8 @@ namespace osu.Game.Overlays.BeatmapListing
[Order(0)] [Order(0)]
Any, Any,
[Order(11)] [Order(14)]
Other, Unspecified,
[Order(1)] [Order(1)]
English, English,
@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapListing
[Order(2)] [Order(2)]
Chinese, Chinese,
[Order(10)] [Order(12)]
Instrumental, Instrumental,
[Order(7)] [Order(7)]
@ -42,6 +42,15 @@ namespace osu.Game.Overlays.BeatmapListing
Spanish, Spanish,
[Order(5)] [Order(5)]
Italian Italian,
[Order(10)]
Russian,
[Order(11)]
Polish,
[Order(13)]
Other
} }
} }