Dean Herbert 02e406860b Merge remote-tracking branch 'upstream/master' into tooltips ... # Conflicts: # osu.Game/Graphics/UserInterface/OsuSliderBar.cs		2017-04-20 18:02:38 +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	Fix conversion regression.	2017-04-20 11:36:50 +09:00
Graphics	Merge remote-tracking branch 'upstream/master' into tooltips	2017-04-20 18:02:38 +09:00
Input	Improve comment of SetFrameFromTime.	2017-03-06 14:15:43 +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
Online	Use 24 hour display for chat times.	2017-04-20 17:10:05 +09:00
Overlays	Add chat toggle button.	2017-04-19 19:54:03 +09:00
Properties	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Rulesets	Update exception name.	2017-04-20 12:11:03 +09:00
Screens	Update exception name.	2017-04-20 12:11:03 +09:00
Users	Merge branch 'master' into score-statistics	2017-04-19 20:36:14 +09:00
osu.Game.csproj	Add tooltip to sliderbars. Move interface.	2017-04-20 17:33:07 +09:00
OsuGame.cs	Add chat toggle button.	2017-04-19 19:54:03 +09:00
OsuGameBase.cs	Merge branch 'master' into tooltips	2017-04-20 15:08:26 +09:00
packages.config	Update nuget packages.	2017-04-12 19:35:16 +09:00