Dean Herbert ac3b435f00 Merge remote-tracking branch 'upstream/master' into hud-improvements ... # Conflicts: # osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs		2017-04-14 19:29:59 +09:00
..
Audio	Make hit sounds into consts.	2017-04-06 12:14:06 +09:00
Beatmaps	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Configuration	Add missing config set.	2017-04-10 16:39:10 +09:00
Database	Metric -> Metrics.	2017-04-12 21:09:39 +09:00
Graphics	Merge remote-tracking branch 'upstream/master' into hud-improvements	2017-04-14 19:29:59 +09:00
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
Input	…
Modes	Merge remote-tracking branch 'upstream/master' into hud-improvements	2017-04-14 19:29:59 +09:00
Online	Combine user models.	2017-03-28 00:08:24 +09:00
Overlays	Small fix to the chat overlay to prevent crashing on the test	2017-04-11 21:35:49 -04:00
Properties	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Screens	Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up	2017-04-14 01:07:34 +09:00
Users	Container->Wrapper.	2017-04-02 16:17:13 +09:00
OsuGame.cs	Fix crash on restart after update.	2017-04-11 18:40:39 +09:00
OsuGameBase.cs	Split noto out into individual ranges.	2017-04-04 11:34:55 +09:00
osu.Game.csproj	Merge remote-tracking branch 'upstream/master' into hud-improvements	2017-04-14 19:29:59 +09:00
packages.config	Update nuget packages.	2017-04-12 19:35:16 +09:00