smoogipooo 854212a7aa Merge branch 'master' into beatmap_parsing ...

Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj

2017-03-14 13:39:19 +09:00

..

Beatmaps

Merge branch 'master' into beatmap_parsing

2017-03-14 13:39:19 +09:00

Configuration

KeyCounter visibility

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

Database

Revert "Merge pull request #441 from tacchinotacchi/archive-reader"

2017-03-14 11:46:34 +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

Revert "Merge pull request #441 from tacchinotacchi/archive-reader"

2017-03-14 11:46:34 +09:00

IPC

Reduce warning/suggestion count to zero.

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

Modes

Merge branch 'master' into beatmap_parsing

2017-03-14 13:39:19 +09:00

Online

Fix warnings not covered by resharper locally.

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

Overlays

Merge branch 'master' into mod_application

2017-03-14 12:38:55 +09:00

Properties

Remove unnecessary using statements

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

Screens

Merge branch 'master' into beatmap_parsing

2017-03-14 13:39:19 +09:00

Users

Fix some license headers.

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

osu.Game.csproj

Merge branch 'master' into beatmap_parsing

2017-03-14 13:39:19 +09:00

OsuGame.cs

Remaining GameMode -> Screen.

2017-03-14 07:22:46 +08:00

OsuGameBase.cs

Reduce warning/suggestion count to zero.

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

packages.config

Add license headers.

2017-03-14 13:02:42 +09:00