Dean Herbert bf9954aede Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs # osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs # osu.Game/Screens/Multi/IRoomManager.cs # osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs # osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs # osu.Game/Screens/Multi/RoomManager.cs		2018-12-26 21:32:12 +09:00
..
Audio	Prefer namespace lookups first	2018-07-10 15:23:47 +09:00
Beatmaps	Fade and no schedule	2018-12-26 21:18:55 +09:00
Configuration	Move primary key attribute to IHasPrimaryKey	2018-11-28 13:19:23 +09:00
Database	Do not delete file on import failure	2018-12-18 22:49:53 +03:00
Graphics	Add better messaging when connecting or failing	2018-12-26 18:07:33 +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	Add error message when creation fails	2018-12-26 21:18:44 +09:00
Overlays	Merge branch 'updateable-beatmap-sprite' into timeshift-wip	2018-12-26 20:52:36 +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	Merge remote-tracking branch 'origin/master' into timeshift-wip	2018-12-21 12:51:31 +09:00
Scoring	Make RoomScore derive ScoreInfo	2018-12-22 15:17:35 +09:00
Screens	Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip	2018-12-26 21:32:12 +09:00
Skinning	Fix crash when changing beatmap toggles at loading screen	2018-12-13 14:51:18 +09:00
Storyboards	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Tests	Fix OsuTestCase beatmap not having a correct default beatmap	2018-12-05 20:33:27 +09:00
Users	Add click to avatar	2018-12-22 14:23:53 +09:00
Utils	Use HResult	2018-10-31 17:07:05 +09:00
osu!.res	And then everything became one	2017-09-19 16:06:58 +09:00
osu.Game.csproj	Update framework	2018-12-26 18:49:33 +09:00
OsuGame.cs	Merge remote-tracking branch 'origin/master' into timeshift-wip	2018-12-22 23:23:21 +09:00
OsuGameBase.cs	Merge branch 'updateable-beatmap-sprite' into timeshift-wip	2018-12-26 20:52:36 +09:00