Dean Herbert b110a879a7 Merge branch 'refs/heads/master' into api-channels-messages ...

# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

2016-10-01 17:05:56 +09:00

..

Beatmaps

Use the old naming style for now.

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

Configuration

Add minimum resolution settings.

2016-09-01 22:47:48 +09:00

GameModes

Merge remote-tracking branch 'upstream/master' into beatmap_framework

2016-09-30 00:13:08 +09:00

Graphics

Merge remote-tracking branch 'upstream/master' into beatmap_framework

2016-09-30 00:13:08 +09:00

Online

Merge remote-tracking branch 'upstream/master' into api-channels-messages

2016-09-29 23:54: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 branch 'refs/heads/master' into api-channels-messages

2016-10-01 17:05:56 +09:00

OsuGame.cs

Merge branch 'refs/heads/master' into api-channels-messages

2016-10-01 17:05:56 +09:00

OsuGameBase.cs

Merge remote-tracking branch 'upstream/master' into api-channels-messages

2016-09-29 23:54:33 +09:00

packages.config

Update nuget packages and framework reference once more.

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