Dean Herbert 62c5ad907a Merge remote-tracking branch 'upstream/master' into login-updates ...

# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs

2017-01-31 17:05:33 +09:00

..

Beatmaps

Merge branch 'master' into add-flash-effects

2017-01-30 21:47:05 +09:00

Configuration

Simplify checking

2017-01-28 17:01:11 +03:00

Database

Add StarDifficulty property and correct colouring of difficulty icons.

2017-01-30 15:26:28 +09:00

Graphics

Merge branch 'master' into add-flash-effects

2017-01-30 21:47:05 +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

Hook up icons better.

2017-01-30 13:35:40 +09:00

Online

Add central color class

2017-01-09 17:20:31 -05:00

Overlays

Merge remote-tracking branch 'upstream/master' into login-updates

2017-01-31 17:05:33 +09:00

Properties

License -> Licence.

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

Screens

Merge branch 'master' into add-flash-effects

2017-01-30 21:47:05 +09:00

Users

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

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

osu.Game.csproj

Merge remote-tracking branch 'upstream/master' into login-updates

2017-01-31 17:05:33 +09:00

OsuGame.cs

Move login screen to toolbar and update design (still not fully implemented).

2017-01-30 22:55:35 +09:00

OsuGameBase.cs

Merge branch 'master' into login_fix

2017-01-28 11:24:08 +02:00

packages.config

Add missing licence headers.

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