Dean Herbert 798bc1306b Merge remote-tracking branch 'upstream/master' into m2307-master ...

# Conflicts:
#	osu.Game/Screens/Select/SongSelect.cs

2019-03-01 10:08:35 +09:00

..

Audio

Fix remaining issues

2019-02-28 13:31:40 +09:00

Beatmaps

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

Configuration

Fix remaining issues

2019-02-28 13:31:40 +09:00

Database

Merge branch 'master' into hide-desktop-only-elements

2019-02-28 18:50:16 +09:00

Graphics

More formatting fixes

2019-02-28 20:30:23 +09:00

Input

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

IO

Fix remaining issues

2019-02-28 13:31:40 +09:00

IPC

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00

Migrations

Fix scores being stored as ints

2019-02-26 13:10:59 +09:00

Online

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

Overlays

Use local variables where appropriate

2019-02-28 19:58:48 +09:00

Properties

Merge remote-tracking branch 'origin/master' into samah-ios

2019-01-25 11:51:44 +09:00

Replays

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00

Rulesets

Merge branch 'master' into use-pattern-matching

2019-02-28 14:53:07 +09:00

Scoring

Fix remaining issues

2019-02-28 13:31:40 +09:00

Screens

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

2019-03-01 10:08:35 +09:00

Skinning

Fix remaining issues

2019-02-28 13:31:40 +09:00

Storyboards

Merge branch 'master' into use-pattern-matching

2019-02-28 14:53:07 +09:00

Tests

Fix remaining issues

2019-02-28 13:31:40 +09:00

Users

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

Utils

Update licence header (and remove year)

2019-01-24 17:43:03 +09:00

osu!.res

…

osu.Game.csproj

Update framework

2019-02-28 18:49:59 +09:00

OsuGame.cs

Fix potential race condition

2019-02-28 17:17:57 +09:00

OsuGameBase.cs

Update variable names

2019-02-22 17:51:39 +09:00