Jorolf f6f75fac74 Merge branch 'master' of git://github.com/ppy/osu into tooltips ... # Conflicts: # osu.Game/Graphics/Cursor/MenuCursor.cs		2017-04-13 23:12:07 +02: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 branch 'master' of git://github.com/ppy/osu into tooltips	2017-04-13 23:12:07 +02:00
Input
IO	Implement IJsonSerializable, BeatmapInfo IJsonSerializable.	2017-04-06 15:54:50 +09:00
IPC
Modes	Trim whitespace	2017-04-12 15:06:46 +09:00
Online
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	Fix MosueUp and HighResolution events not being handled by MenuOverlays.	2017-04-13 13:03:07 +09:00
Users	Container->Wrapper.	2017-04-02 16:17:13 +09:00
osu.Game.csproj	Merge branch 'master' of git://github.com/ppy/osu into tooltips	2017-04-13 23:12:07 +02: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
packages.config	Update nuget packages.	2017-04-12 19:35:16 +09:00