Dean Herbert 482a01e7ba Merge branch 'master' into tournament-tools ... # Conflicts: # osu.Game/Online/API/Requests/Responses/APIBeatmap.cs # osu.Game/OsuGameBase.cs # osu.Game/Overlays/ChatOverlay.cs # osu.Game/Screens/Menu/MainMenu.cs # osu.Game/Screens/Tournament/Drawings.cs # osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs # osu.Game/osu.Game.csproj # osu.sln		2019-02-02 19:09:48 +09:00
..
Audio	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Beatmaps	Merge remote-tracking branch 'upstream/master' into download-tracking-component	2019-01-31 18:45:09 +09:00
Configuration	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Database	Fix incorrect param doc	2019-01-29 23:04:48 +09:00
Graphics	Merge remote-tracking branch 'origin/master' into iscreen	2019-01-29 21:21:36 +09:00
Input	Merge branch 'master' into fix-idle-weirdness	2019-01-25 17:52:59 +09:00
IO	Fix codefactor issue	2019-01-24 17:46:09 +09:00
IPC	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Migrations	Add explicit beatmap -> scores relationship rather than relying on cascades	2019-01-08 17:53:43 +09:00
Online	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Overlays	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +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	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Scoring	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Screens	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Skinning	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Storyboards	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Tests	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Users	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Utils	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
osu!.res	And then everything became one	2017-09-19 16:06:58 +09:00
osu.Game.csproj	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
OsuGame.cs	Fix osu! logo potentially appearing during game load in a weird place	2019-01-31 19:22:29 +09:00
OsuGameBase.cs	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00