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

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
#	osu.Game/Beatmaps/BeatmapInfo.cs
#	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
This commit is contained in:
smoogipoo
2017-10-14 12:38:59 +09:00
parent 4653470779 b82f3fc710
commit b83d7cd4df
65 changed files with 2240 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/BeatmapInfo.cs
View File

@ -19,9 +19,11 @@ namespace osu.Game.Beatmaps
//TODO: should be in database
public int BeatmapVersion;
[JsonProperty("id")]
[NotMapped]
public int? BeatmapOnlineInfoId { get; set; }
[JsonProperty("beatmapset_id")]
[NotMapped]
public int? BeatmapSetOnlineInfoId { get; set; }