Dean Herbert 8176b4ef77

Fix merge errors.

2017-03-14 22:11:38 +09:00

..

Beatmaps

Merge branch 'master' into mod_application

2017-03-14 12:38:55 +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 https://github.com/ppy/osu into leaderboards

2017-03-13 09:36:16 -03: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

Fix merge errors.

2017-03-14 22:11:38 +09:00

Online

Fix warnings not covered by resharper locally.

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

Overlays

Merge branch 'master' into leaderboards

2017-03-14 10:07:33 -03:00

Properties

Remove unnecessary using statements

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

Screens

Fix merge errors.

2017-03-14 22:11:38 +09:00

Users

Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore

2017-03-13 09:33:25 -03:00

osu.Game.csproj

Woops

2017-03-14 10:09:58 -03: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

Update license headers.

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