Thomas Müller 4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms ...

# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs

2017-07-18 15:16:02 +03:00

..

Beatmaps

Make metadata a member of WorkingBeatmap.

2017-05-06 14:52:28 +08:00

Platform

Remove all trailing whitespaces in this repo.

2017-04-06 16:21:18 +08:00

Tests

Merge branch 'master' of https://github.com/ppy/osu into better-transforms

2017-07-18 15:16:02 +03:00

AutomatedVisualTestGame.cs

Fix nullref.

2017-03-31 18:05:24 +09:00

OpenTK.dll.config

Add/update license headers.

2017-02-14 18:17:35 +09:00

osu.Desktop.VisualTests.csproj

Merge branch 'master' into profile

2017-07-14 22:52:19 +08:00

packages.config

Update nuget packages

2017-06-13 11:50:46 +09:00

Program.cs

Make a RulesetDatabase.

2017-04-17 17:43:48 +09:00

VisualTestGame.cs

Add support for framework-level mouse confining.

2017-05-02 17:45:42 +09:00