smoogipooo aed89b7c0f Merge branch 'general_hud' into counter_bindables ...

Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
	osu.Game/Modes/UI/HUDOverlay.cs

2017-03-10 14:44:29 +09:00

..

Beatmaps

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

2017-03-07 13:50:08 +09:00

Configuration

KeyCounter visibility

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

Database

Reduce warning/suggestion count to zero.

2017-03-09 15:52:40 +09:00

Graphics

Merge branch 'master' into counter_bindables

2017-03-10 14:21:33 +09:00

Input

Improve comment of SetFrameFromTime.

2017-03-06 14:15:43 +09:00

IO/Legacy

Reduce warning/suggestion count to zero.

2017-03-09 15:52:40 +09:00

IPC

Reduce warning/suggestion count to zero.

2017-03-09 15:52:40 +09:00

Modes

Merge branch 'general_hud' into counter_bindables

2017-03-10 14:44:29 +09:00

Online

Fix warnings not covered by resharper locally.

2017-03-09 16:07:34 +09:00

Overlays

Merge pull request #458 from Lahvuun/master

2017-03-10 13:20:07 +09:00

Properties

Remove unnecessary using statements

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

Screens

General fixes.

2017-03-10 13:09:50 +09:00

Users

Fix some license headers.

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

app.config

Update license headers.

2017-03-08 15:50:52 +09:00

osu.Game.csproj

General fixes.

2017-03-10 13:09:50 +09:00

OsuGame.cs

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

2017-03-07 13:50:08 +09:00

OsuGameBase.cs

Reduce warning/suggestion count to zero.

2017-03-09 15:52:40 +09:00

packages.config

Update license headers.

2017-03-08 15:50:52 +09:00