Thomas Müller 32ee20b843 Merge branch 'master' of github.com:ppy/osu into better-clocks ...

# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs

2016-11-06 10:08:24 +01:00

..

Beatmaps

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

2016-11-06 10:08:24 +01:00

Configuration

Add default values from old osu

2016-11-03 19:06:22 -04:00

Database

Add beatmap backgrounds.

2016-11-05 20:00:14 +09:00

GameModes

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

2016-11-06 10:08:24 +01:00

Graphics

Remove now obsolete clock usages.

2016-11-06 10:06:09 +01: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

Fade the options overlay to prevent unnecessary updates to its content.

2016-11-06 08:54:36 +01: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

Add HitObject colours back in the mix.

2016-11-04 15:43:53 +09:00

OsuGame.cs

Import enum from old osu

2016-11-03 19:06:22 -04:00

OsuGameBase.cs

Add full Exo font set and bring song select panels closer to final design.

2016-11-05 18:22:09 +09:00

packages.config

Framework & OpenTK updates.

2016-10-26 23:13:44 +09:00