Andrei Zavatski dee9ffc694 Merge master with conflicts resolved

2019-11-22 04:59:46 +03:00

..

Audio

Reword comment

2019-11-21 10:37:50 +09:00

Beatmaps

Sadly, xmldoc doesn't support tuple elements.

2019-11-17 21:01:56 +08:00

Configuration

Improve naming

2019-11-22 02:38:31 +09:00

Database

Use typeparamref.

2019-11-17 20:48:23 +08:00

Graphics

Add final newline

2019-11-22 02:39:54 +09:00

Input

Use typeparamref.

2019-11-17 20:48:23 +08:00

IO

Share framework file-exclusion function

2019-10-30 19:34:17 +09:00

IPC

Move ArchiveModelManager import process to async flow

2019-06-10 13:42:22 +09:00

Migrations

Use correct database migration

2019-09-13 13:57:55 +03:00

Online

Update obsolete usages

2019-11-21 10:55:31 +09:00

Overlays

Merge master with conflicts resolved

2019-11-22 04:59:46 +03:00

Properties

Merge branch 'master' into correct-preview-loop

2019-01-31 10:53:09 +01:00

Replays

Update licence header (and remove year)

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

Rulesets

Merge master with conflicts resolved

2019-11-22 04:59:46 +03:00

Scoring

Add null check

2019-11-20 13:42:54 +09:00

Screens

Improve naming

2019-11-22 02:38:31 +09:00

Skinning

Apply other styles.

2019-11-11 20:27:04 +08:00

Storyboards

Apply other styles.

2019-11-11 20:27:04 +08:00

Tests

.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.

2019-11-20 13:37:47 +01:00

Updater

Resolve new diagnostics in C# 7.3

2019-10-30 23:13:11 +08:00

Users

Apply brace style.

2019-11-11 20:13:13 +08:00

Utils

Fix spacing

2019-11-21 22:55:31 +09:00

osu!.res

…

osu.Game.csproj

Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation

2019-11-21 22:52:45 +09:00

OsuGame.cs

Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation

2019-11-21 22:52:45 +09:00

OsuGameBase.cs

Move scaling container to OsuGame so OsuGameBase doesn't apply… (#6804)

2019-11-12 16:40:49 +09:00