smoogipoo b83d7cd4df Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ...

# Conflicts:
#	osu-framework
#	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
#	osu.Game/Beatmaps/BeatmapInfo.cs
#	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs

2017-10-14 12:38:59 +09:00

..

Audio

move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton

2017-10-06 21:02:00 +02:00

Beatmaps

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

Configuration

Merge branch 'master' into storyboard_integration

2017-09-22 12:45:34 +02:00

Database

Small DB-related refactoring

2017-10-09 23:30:32 +03:00

Graphics

Merge remote-tracking branch 'upstream/master' into ranks-section

2017-10-13 18:49:05 +09:00

Input

Rework EF Core usage in model classes

2017-10-06 00:23:26 +03:00

IO

Fix RulesetStore preparation

2017-10-10 22:29:16 +03:00

IPC

*Database -> *Store

2017-07-27 16:56:41 +09:00

Migrations

Fix BeatmapMetadata removing

2017-10-10 00:17:12 +03:00

Online

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

Overlays

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

Properties

And then everything became one

2017-09-19 16:06:58 +09:00

Resources

And then everything became one

2017-09-19 16:06:58 +09:00

Rulesets

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

Screens

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

Storyboards

Rework EF Core usage in model classes

2017-10-06 00:23:26 +03:00

Tests

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

Users

Merge branch 'master' into more_context_menus

2017-09-14 19:21:29 +09:00

app.config

And then everything became one

2017-09-19 16:06:58 +09:00

lazer.ico

And then everything became one

2017-09-19 16:06:58 +09:00

OpenTK.dll.config

Update all dependencies in line with framework

2017-09-13 20:25:40 +09:00

osu!.res

And then everything became one

2017-09-19 16:06:58 +09:00

osu.Game.csproj

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

osu.nuspec

And then everything became one

2017-09-19 16:06:58 +09:00

OsuGame.cs

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

OsuGameBase.cs

Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

2017-10-14 12:38:59 +09:00

OsuGameDesktop.cs

And then everything became one

2017-09-19 16:06:58 +09:00

OsuTestBrowser.cs

And then everything became one

2017-09-19 16:06:58 +09:00

packages.config

Initial EF Core commit

2017-10-04 22:52:12 +03:00

Program.cs

And then everything became one

2017-09-19 16:06:58 +09:00