smoogipoo ce57bdb8db Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design ...

# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs

2019-03-20 17:12:34 +09:00

..

Audio

Fix remaining issues

2019-02-28 13:31:40 +09:00

Beatmaps

Merge branch 'master' into ruleset-container-refactor

2019-03-20 14:55:58 +09:00

Configuration

Merge remote-tracking branch 'origin/master' into move-osu-settings

2019-03-05 13:25:03 +09:00

Database

Add the ability for ArchiveModelManager to re-import even when existing entry is present

2019-03-11 17:04:18 +09:00

Graphics

Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design

2019-03-08 16:32:46 +09:00

Input

Merge branch 'master' into more-inspections

2019-02-28 14:32:57 +09:00

IO

Fix remaining issues

2019-02-28 13:31:40 +09:00

IPC

Update licence header (and remove year)

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

Migrations

Address styling issues on CodeFactor

2019-03-14 16:05:54 -07:00

Online

Merge branch 'master' into update-framework

2019-03-18 11:34:59 +09:00

Overlays

Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design

2019-03-20 17:12:34 +09:00

Properties

Merge remote-tracking branch 'origin/master' into samah-ios

2019-01-25 11:51:44 +09:00

Replays

Update licence header (and remove year)

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

Rulesets

Reorder class

2019-03-20 14:55:38 +09:00

Scoring

Merge branch 'master' into fix-disabled-set-crash

2019-03-05 17:25:13 +09:00

Screens

Merge branch 'master' into ruleset-container-refactor

2019-03-20 14:55:58 +09:00

Skinning

Automate includes of files in ArchiveModelManager use cases

2019-03-01 10:25:21 +09:00

Storyboards

Correct null check

2019-03-18 18:19:59 +09:00

Tests

Merge remote-tracking branch 'upstream/master' into player-test-flexibility

2019-03-19 20:33:39 +09:00

Users

Fix usages of OnLoadComplete

2019-03-17 13:44:20 +09:00

Utils

Fix stuck r# inspection

2019-03-08 12:16:12 +09:00

osu!.res

…

osu.Game.csproj

Update framework

2019-03-19 17:32:36 +09:00

OsuGame.cs

Merge branch 'master' into fix-disabled-set-crash

2019-03-05 17:25:13 +09:00

OsuGameBase.cs

Use interface to access API

2019-03-13 12:58:18 +09:00