Dean Herbert aa96d98822 Merge branch 'master' into limit-game-access ...

Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
	osu.Game/GameModes/Menu/ButtonSystem.cs
	osu.Game/Online/Chat/Display/ChatLine.cs
	osu.Game/OsuGame.cs
	osu.Game/Overlays/ToolbarButton.cs

2016-10-12 20:44:33 +09:00

..

Beatmaps

Use the old naming style for now.

2016-09-26 15:07:29 +09:00

Configuration

Add basic VolumeControl and saving of volume to config.

2016-10-08 15:54:00 +09:00

GameModes

Merge branch 'master' into limit-game-access

2016-10-12 20:44:33 +09:00

Graphics

Make stuff compile again (but StarCounter hits assertions).

2016-10-12 16:11:40 +09:00

Input

Add in-game chat display, along with a global hotkey handling method.

2016-10-08 19:23:21 +09:00

Online

Merge branch 'master' into limit-game-access

2016-10-12 20:44:33 +09:00

Overlays

Merge branch 'master' into limit-game-access

2016-10-12 20:44:33 +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

Merge remote-tracking branch 'refs/remotes/upstream/master'

2016-10-12 15:20:23 +09:00

OsuGame.cs

Merge branch 'master' into limit-game-access

2016-10-12 20:44:33 +09:00

OsuGameBase.cs

Update framework and simplify some references.

2016-10-12 19:52:49 +09:00

packages.config

Update nuget packages and framework reference once more.

2016-09-06 20:41:18 +09:00

VolumeControl.cs

Remove all non-load Game access.

2016-10-12 15:47:08 +09:00