Thomas Müller 2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms ...

# Conflicts:
#	osu-framework

2017-07-21 11:15:26 +02:00

..

Backgrounds

Give song select a better default background whecn the beatmap's can't be loaded

2017-07-19 15:16:55 +09:00

Charts

Fix most warnings.

2017-03-07 13:05:57 +09:00

Direct

Fix most warnings.

2017-03-07 13:05:57 +09:00

Edit

Merge branch 'master' of github.com:ppy/osu into better-transforms

2017-07-19 19:15:51 +02:00

Menu

Merge branch 'master' of github.com:ppy/osu into better-transforms

2017-07-21 11:15:26 +02:00

Multiplayer

Update framework and fix compilation

2017-07-14 19:18:12 +03:00

Play

Merge branch 'master' of github.com:ppy/osu into better-transforms

2017-07-21 11:15:26 +02:00

Ranking

Merge branch 'master' of github.com:ppy/osu into better-transforms

2017-07-19 19:15:51 +02:00

Select

Merge branch 'master' of github.com:ppy/osu into better-transforms

2017-07-21 11:15:26 +02:00

Tournament

Update framework

2017-07-16 13:59:26 +03:00

BackgroundScreen.cs

Mode -> Ruleset.

2017-04-18 16:05:58 +09:00

Loader.cs

Add new main menu backgrounds

2017-06-26 19:10:13 +09:00

OsuScreen.cs

Make Beatmap (bindable) non-nullable.

2017-07-19 15:16:53 +09:00

ScreenWhiteBox.cs

Get rid of raw AddDelay calls within osu.Game

2017-07-17 16:51:21 +03:00