smoogipoo ca87b42758 Merge branch 'timeshift-player' ...

# Conflicts:
#	osu.Game/Screens/Multi/Multiplayer.cs

2018-12-13 17:06:44 +09:00

..

Audio

Prefer namespace lookups first

2018-07-10 15:23:47 +09:00

Beatmaps

Merge branch 'timeshift'

2018-12-13 17:06:20 +09:00

Configuration

Move primary key attribute to IHasPrimaryKey

2018-11-28 13:19:23 +09:00

Database

Fix duplicates not being ignored if hash is null

2018-11-30 18:40:06 +09:00

Graphics

Fix compilation issues (+ use updated framework)

2018-12-10 13:48:05 +09:00

Input

Merge branch 'master' into scoredatabase

2018-11-30 14:59:58 +09:00

IO

Add LegacyFileArchiveReader

2018-11-28 16:13:16 +09:00

IPC

Initial scoremanager/scorestore structure

2018-11-28 16:50:16 +09:00

Migrations

Fix some data types on ScoreInfo

2018-11-30 20:43:38 +09:00

Online

Merge branch 'timeshift'

2018-12-13 17:06:20 +09:00

Overlays

Merge branch 'timeshift'

2018-12-13 17:06:20 +09:00

Properties

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Replays

Remove User from Replay

2018-11-30 18:25:14 +09:00

Rulesets

Add 1ms offset to controlpoint lookup times

2018-12-04 12:08:46 +09:00

Scoring

Change statistics to be int for now

2018-12-05 19:44:01 +09:00

Screens

Merge branch 'timeshift-player'

2018-12-13 17:06:44 +09:00

Skinning

Merge remote-tracking branch 'upstream/master' into scoredatabase

2018-11-30 17:20:23 +09:00

Storyboards

OpenTK -> osuTK

2018-11-21 23:11:08 +01:00

Tests

Fix OsuTestCase beatmap not having a correct default beatmap

2018-12-05 20:33:27 +09:00

Users

OpenTK -> osuTK

2018-11-21 23:11:08 +01:00

Utils

Use HResult

2018-10-31 17:07:05 +09:00

osu!.res

…

osu.Game.csproj

Merge branch 'timeshift'

2018-12-13 17:06:20 +09:00

OsuGame.cs

Fix compilation issues (+ use updated framework)

2018-12-10 13:48:05 +09:00

OsuGameBase.cs

Fix OsuBindableBeatmap not being able to be auto-constructed

2018-12-05 20:42:16 +09:00