smoogipoo a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game/Overlays/Music/PlaylistOverlay.cs # osu.Game/Screens/OsuScreen.cs		2018-05-28 18:01:15 +09:00
..
Audio	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Beatmaps	Make GameBeatmap late-bind its AudioManager for ctor Beatmap access	2018-05-28 17:55:41 +09:00
Configuration	Add keybind to disable mouse buttons	2018-05-02 19:37:47 +09:00
Database	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Graphics	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00
Input	Resolve merge conflict	2018-05-18 00:25:47 +03:00
IO	Don't deep-clone beatmapinfo/control points	2018-05-17 13:17:33 +09:00
IPC	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Migrations	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Online	Add Lounge FilterControl.	2018-05-22 00:24:39 -03:00
Overlays	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00
Properties	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Rulesets	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
Screens	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00
Skinning	User pattern matching	2018-04-25 16:32:06 +09:00
Storyboards	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
Tests	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00
Users	Updated UserStatus.cs to make more sense(UNTESTED)	2018-04-26 12:57:24 +02:00
Utils	Normalize all the line endings	2018-04-13 18:26:38 +09:00
osu!.res	And then everything became one	2017-09-19 16:06:58 +09:00
osu.Game.csproj	bump NUnit to version 3.10.1	2018-04-13 13:19:52 +02:00
osu.nuspec	Update license year.	2018-01-22 18:22:38 +01:00
OsuGame.cs	Rename CursorOverrideContainer to MenuCursorContainer	2018-05-25 21:13:40 +02:00
OsuGameBase.cs	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-05-28 18:01:15 +09:00