Dean Herbert c420c55291 Merge branch 'master' into hit-samples ...

# Conflicts:
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs

2016-12-13 17:57:24 +09:00

..

Beatmaps

Add missing licence headers.

2016-12-06 19:07:15 +09:00

Configuration

Make star display min/max a double

2016-12-07 09:42:53 -05:00

Database

Add missing licence headers.

2016-12-06 19:07:15 +09:00

Graphics

Make counters closer to what they should be looking like.

2016-12-07 21:05:29 +09: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

Modes

Merge branch 'master' into hit-samples

2016-12-13 17:57:24 +09:00

Online

Add missing licence headers.

2016-12-06 19:07:15 +09:00

Overlays

Merge branch 'refs/heads/master' into general-fixes

2016-12-08 13:29:59 +09:00

Properties

License -> Licence.

2016-08-26 17:27:49 +09:00

Screens

Merge branch 'master' into hit-samples

2016-12-13 17:57:24 +09:00

Users

Add basic class structure for Beatmap/HitObject/SampleInfo/User.

2016-09-06 21:41:16 +09:00

osu.Game.csproj

Switch to System.ComponentModel.Description

2016-12-07 09:42:53 -05:00

OsuGame.cs

Add ability to adjust game clock's speed (pgup/pgdn).

2016-12-05 19:33:38 +09:00

OsuGameBase.cs

Add missing licence headers.

2016-12-06 19:07:15 +09:00

packages.config

Add missing licence headers.

2016-12-06 19:07:15 +09:00