Dean Herbert a0e1513df6 Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence ... # Conflicts: # osu.Game/OsuGame.cs		2016-11-11 13:30:57 +09:00
..
Beatmaps	AudioEquals method for BeatmapInfo.	2016-11-07 21:52:23 +08:00
Configuration	Wire up one of the settings to the config	2016-11-07 22:36:24 -05:00
Database	More robust metadata handling.	2016-11-07 23:12:49 +08:00
GameModes	Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence	2016-11-11 13:30:57 +09:00
Graphics	Initial updates to make generic containers work.	2016-11-07 21:13:56 +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	Add async workflow.	2016-11-01 23:24:14 +09:00
Overlays	Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence	2016-11-11 13:30:57 +09:00
Properties
Users	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
osu.Game.csproj	Merge pull request #103 from huoyaoyuan/music-controller	2016-11-10 12:54:56 +09:00
OsuGame.cs	Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence	2016-11-11 13:30:57 +09:00
OsuGameBase.cs	Merge pull request #103 from huoyaoyuan/music-controller	2016-11-10 12:54:56 +09:00
packages.config	Framework & OpenTK updates.	2016-10-26 23:13:44 +09:00