smoogipoo 30b7b7961f Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling ... # Conflicts: # osu-framework # osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs		2018-06-12 14:22:27 +09:00
..
Audio
Beatmaps	Use Any() instead of Count()	2018-06-08 20:54:09 +09:00
Configuration	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Database	Merge branch 'master' into fix-database-migration-failure	2018-06-06 22:44:35 +09:00
Graphics	Merge branch 'master' into disallow-beatmap-change	2018-06-06 20:26:17 +09:00
Input
IO	Standardise path	2018-06-06 20:55:42 +09:00
IPC
Migrations
Online	Add missing header	2018-06-08 12:06:58 +09:00
Overlays	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Properties
Rulesets	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Screens	Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling	2018-06-12 14:22:27 +09:00
Skinning
Storyboards	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
Tests	Use new bind method	2018-06-07 16:46:54 +09:00
Users
Utils	Implement DebugUtils locally	2018-06-06 18:33:10 +09:00
osu!.res
osu.Game.csproj	Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework	2018-06-11 20:17:33 +09:00
osu.nuspec
OsuGame.cs	Rewrite much state logic	2018-06-06 16:17:51 +09:00
OsuGameBase.cs	Use a global ruleset config cache	2018-06-11 15:07:42 +09:00