Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection ... # Conflicts: # osu-framework # osu.Game/GameModes/OsuGameMode.cs # osu.Game/GameModes/Play/Player.cs # osu.Game/OsuGame.cs # osu.Game/Overlays/MusicController.cs # osu.Game/Overlays/Options/EditorSection.cs # osu.Game/Overlays/Options/Input/MouseOptions.cs # osu.Game/Overlays/Options/Online/InGameChatOptions.cs # osu.Game/Overlays/Options/SkinSection.cs		2016-11-12 20:18:26 +09:00
..
Beatmaps	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Configuration	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Database	More robust metadata handling.	2016-11-07 23:12:49 +08:00
GameModes	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Graphics	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Input	Add in-game chat display, along with a global hotkey handling method.	2016-10-08 19:23:21 +09:00
IPC	Make importing work properly.	2016-10-24 11:39:53 -04:00
Online	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Overlays	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Properties	License -> Licence.	2016-08-26 17:27:49 +09:00
Users	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
osu.Game.csproj	Introduce back the concept of Rulesets.	2016-11-12 18:26:21 +09:00
OsuGame.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
OsuGameBase.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
packages.config	Framework & OpenTK updates.	2016-10-26 23:13:44 +09:00