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

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

History

..

Tests

Merge branch 'master' into limit-game-access

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

osu.Desktop.VisualTests.csproj

Merge branch 'master' into counters

2016-10-08 22:02:43 -05:00

Program.cs

Update framework; amend ToolbarButton to use padding and Children initialiser.

2016-10-12 12:24:07 +09:00

VisualTestGame.cs

Remove all non-load Game access.

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