Dean Herbert ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake ... # Conflicts: # osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs # osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs		2018-08-24 15:26:36 +09:00
..
Audio	Prefer namespace lookups first	2018-07-10 15:23:47 +09:00
Beatmaps	Compare with invariant culture	2018-08-24 10:12:30 +09:00
Configuration	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Database	Fix threads being cross-disposed from DatabaseContextFactory	2018-08-22 14:07:52 +09:00
Graphics	Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake	2018-08-24 15:26:36 +09:00
Input	Update framework	2018-07-21 16:21:53 +09:00
IO	Standardise path	2018-06-06 20:55:42 +09:00
IPC	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Migrations	Update framework	2018-07-21 16:21:53 +09:00
Online	Add LocalMessage	2018-08-03 20:03:43 +09:00
Overlays	Fix notifications appearing too early in load process	2018-08-23 11:21:56 +09:00
Properties	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Rulesets	Skip invalid hitobject types, log error instead	2018-08-22 15:59:58 +09:00
Screens	Fix notifications appearing too early in load process	2018-08-23 11:21:56 +09:00
Skinning	Fix nullref	2018-08-23 15:21:36 +09:00
Storyboards	Merge branch 'master' into storyboard-samples	2018-07-13 18:34:51 +09:00
Tests	Prevent fatal failures on delete failures	2018-07-23 10:39:43 +02:00
Users	Fix regression in drawable rank first display	2018-07-13 19:53:29 +09:00
Utils	Add back missing statement	2018-08-17 12:27:36 +09:00
osu!.res	And then everything became one	2017-09-19 16:06:58 +09:00
osu.Game.csproj	Update framework	2018-08-21 18:46:44 +09:00
OsuGame.cs	Expand out on to multiple lines	2018-08-20 16:06:12 +09:00
OsuGameBase.cs	Hide unnecessary log output	2018-07-24 12:13:48 +02:00