Dean Herbert 7fe2f6639d Merge remote-tracking branch 'upstream/master' into results-screen ... # Conflicts: # osu.Game/Users/User.cs		2017-04-19 20:51:05 +09:00
..
Audio	Make hit sounds into consts.	2017-04-06 12:14:06 +09:00
Beatmaps	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Configuration	Remove unused usings.	2017-04-15 05:57:18 +09:00
Database	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Graphics	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Input
IO	Implement IJsonSerializable, BeatmapInfo IJsonSerializable.	2017-04-06 15:54:50 +09:00
IPC	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
Online	Bring API request structure up-to-date.	2017-04-19 16:05:06 +09:00
Overlays	Merge branch 'master' into general-fixes	2017-04-18 16:19:52 +09:00
Properties	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Rulesets	Merge remote-tracking branch 'upstream/master' into results-screen	2017-04-19 20:51:05 +09:00
Screens	Merge remote-tracking branch 'upstream/master' into results-screen	2017-04-19 20:51:05 +09:00
Users	Bring API request structure up-to-date.	2017-04-19 16:05:06 +09:00
osu.Game.csproj	Add beatmap info and score date.	2017-04-18 22:22:14 +09:00
OsuGame.cs	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
OsuGameBase.cs	Update font/size.	2017-04-19 17:32:30 +09:00
packages.config	Update nuget packages.	2017-04-12 19:35:16 +09:00