Dean Herbert 46865bbacd Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix ... # Conflicts: # osu.Game/Audio/SampleInfo.cs		2017-12-23 14:50:35 +09:00
..
Audio	Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix	2017-12-23 14:50:35 +09:00
Beatmaps	Merge branch 'master' into beatmap-serialization	2017-12-22 07:38:05 +09:00
Configuration	Fix incorrect line endings	2017-12-15 14:44:11 +09:00
Database	Update RulesetInfo and add migration	2017-12-10 12:15:55 +09:00
Graphics	Improve LineGraph invalidation logic	2017-12-22 18:58:35 +09:00
Input	Merge master into beatmap-serialization	2017-12-21 22:13:53 +09:00
IO	A bit more cleanup	2017-12-07 15:55:38 +09:00
IPC
Migrations	Update RulesetInfo and add migration	2017-12-10 12:15:55 +09:00
Online	Increase GetScoresRequest timeout & leave existing scores when API dies.	2017-12-20 20:48:30 +05:30
Overlays	Better variable name	2017-12-22 19:25:59 +09:00
Properties
Rulesets	Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix	2017-12-23 14:50:35 +09:00
Screens	Merge branch 'master' into beatmap-serialization	2017-12-22 07:38:05 +09:00
Storyboards	Merge branch 'master' into beatmap-serialization	2017-12-21 13:39:39 +09:00
Tests	Remove unnecessary constructure and make ruleset required	2017-12-20 20:41:01 +09:00
Users	Add ToString() overrides on many classes to make debugging easier	2017-12-16 16:14:01 +09:00
app.config
OpenTK.dll.config
osu!.res
osu.Game.csproj	Merge branch 'master' into beatmap-serialization	2017-12-22 22:45:00 +09:00
osu.nuspec
OsuGame.cs
OsuGameBase.cs	Fix DisposeTrack and improve AsyncLazy to support disposal	2017-11-30 05:05:07 +09:00
packages.config