Dean Herbert 435e845067 Merge branch 'master' into DrabWeb/song-progress-graph ...

# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Overlays/Pause/PauseProgressBar.cs
#	osu.Game/Overlays/Pause/PauseProgressGraph.cs
#	osu.Game/osu.Game.csproj

2017-03-02 20:20:27 +09:00

..

Beatmaps

FlowDirection -> FillDirection

2017-03-01 20:15:38 +01:00

Configuration

KeyCounter visibility

2017-03-01 13:22:01 +03:00

Database

Fix potential nullref caused by test data.

2017-03-02 18:35:24 +09:00

Graphics

Fix some license headers.

2017-03-02 18:45:20 +09:00

Input

Fix GlobalHotkeys not working (regression due to masking rules).

2017-02-20 15:31:15 +09:00

IPC

Update framework and add "Async" suffix to asynchronous methods

2017-02-23 22:32:10 +01:00

Modes

Fix some license headers.

2017-03-02 18:45:20 +09:00

Online

Fix some license headers.

2017-03-02 18:45:20 +09:00

Overlays

Merge branch 'master' into DrabWeb/song-progress-graph

2017-03-02 20:20:27 +09:00

Properties

Remove unnecessary using statements

2017-02-23 21:38:10 +01:00

Screens

Merge branch 'master' into DrabWeb/song-progress-graph

2017-03-02 20:20:27 +09:00

Users

Fix some license headers.

2017-03-02 18:45:20 +09:00

osu.Game.csproj

Merge branch 'master' into DrabWeb/song-progress-graph

2017-03-02 20:20:27 +09:00

OsuGame.cs

Merge branch 'master' into popup-dialog

2017-03-02 16:42:20 +09:00

OsuGameBase.cs

Make beatmap importing async.

2017-02-24 18:12:50 +09:00

packages.config

Update nuget packages.

2017-02-27 20:38:30 +09:00