Jacob Odgård Tørring 37893f9dfe

Merge branch 'master' into master

2018-05-11 09:43:07 +02:00

..

Backgrounds

Normalize all the line endings

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

Charts

Normalize all the line endings

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

Direct

Normalize all the line endings

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

Edit

Fix beatmap/ruleset being changeable while in the editor

2018-05-07 16:32:15 +09:00

Menu

Remove unused usings caused by multiplayer folder restructuring.

2018-05-10 20:49:42 -03:00

Multi

Move multiplayer screens to osu.Game/Screens/Multi/Screens

2018-05-10 20:47:25 -03:00

Play

Merge branch 'master' of https://github.com/odgaard/osu

2018-05-11 09:42:45 +02:00

Ranking

Rename OriginalBeatmap back to Beatmap

2018-05-07 10:29:38 +09:00

Select

Rename OriginalBeatmap back to Beatmap

2018-05-07 10:29:38 +09:00

Tournament

Normalize all the line endings

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

BackgroundScreen.cs

Merge remote-tracking branch 'upstream/master' into peppy-async-screens

2018-04-20 16:52:58 +09:00

Loader.cs

Normalize all the line endings

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

OsuScreen.cs

Adds DisableSeek property to MusicController

2018-05-10 13:20:04 +02:00

ScreenWhiteBox.cs

Normalize all the line endings

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