smoogipoo 4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ...

# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs

2018-06-06 18:26:51 +09:00

..

Audio

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Beatmaps

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

2018-06-06 18:26:51 +09:00

Configuration

Merge branch 'master' into osu-hd-setting

2018-05-17 19:39:17 +02:00

Database

Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts

2018-05-31 14:02:52 +09:00

Graphics

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

2018-05-28 18:01:15 +09:00

Input

Resolve merge conflict

2018-05-18 00:25:47 +03:00

IO

Don't deep-clone beatmapinfo/control points

2018-05-17 13:17:33 +09:00

IPC

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Migrations

Remove unique constraints on hash columns

2018-05-29 16:26:32 +09:00

Online

Fix web request failures not being correctly handled at an APIRequest level

2018-06-03 13:01:52 +09:00

Overlays

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

2018-06-06 18:26:51 +09:00

Properties

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Rulesets

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

2018-06-06 18:26:51 +09:00

Screens

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

2018-06-06 18:26:51 +09:00

Skinning

User pattern matching

2018-04-25 16:32:06 +09:00

Storyboards

Privatise the OsuGame beatmap, add local beatmap to OsuTestCase

2018-05-23 17:38:02 +09:00

Tests

Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

2018-06-06 18:26:51 +09:00

Users

Updated UserStatus.cs to make more sense(UNTESTED)

2018-04-26 12:57:24 +02:00

Utils

Normalize all the line endings

2018-04-13 18:26:38 +09:00

osu!.res

And then everything became one

2017-09-19 16:06:58 +09:00

osu.Game.csproj

Bring entity framework up-to-date and re-enable transactions

2018-05-29 16:23:27 +09:00

osu.nuspec

Update license year.

2018-01-22 18:22:38 +01:00

OsuGame.cs

Rename CursorOverrideContainer to MenuCursorContainer

2018-05-25 21:13:40 +02:00

OsuGameBase.cs

Merge branch 'master' into disallow-beatmap-change

2018-06-04 10:53:04 +09:00