smoogipoo b5d187c4af Fix post-merge errors

2019-01-29 21:27:32 +09:00

..

Backgrounds

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

Charts

Update licence header (and remove year)

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

Direct

Update licence header (and remove year)

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

Edit

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

Menu

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

Multi

Fix post-merge errors

2019-01-29 21:27:32 +09:00

Play

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

Ranking

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

Select

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

Tournament

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

BackgroundScreen.cs

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

BackgroundScreenStack.cs

Create a custom background stack to fix various background issues

2019-01-25 15:36:22 +09:00

BlurrableBackgroundScreen.cs

Update licence header (and remove year)

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

IOsuScreen.cs

Move toolbar showing and overlay activation to OsuGame

2019-01-28 15:42:06 +09:00

Loader.cs

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00

OsuScreen.cs

Fix post-merge errors

2019-01-29 21:27:32 +09:00

ScreenWhiteBox.cs

Merge remote-tracking branch 'origin/master' into iscreen

2019-01-29 21:21:36 +09:00