smoogipoo f674fcf2c8 Merge branch 'mask-separation' into editor-mask-placement ...

# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
#	osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs

2018-10-26 14:05:30 +09:00

..

Beatmaps

Preserve the beatmap's version

2018-10-23 14:59:21 +09:00

Chat

Normalize all the line endings

2018-04-13 18:26:38 +09:00

NonVisual

Fix up performance calculators

2018-06-14 16:04:48 +09:00

Resources

Preserve the beatmap's version

2018-10-23 14:59:21 +09:00

Visual

Merge branch 'mask-separation' into editor-mask-placement

2018-10-26 14:05:30 +09:00

osu.Game.Tests.csproj

Remove nuget includes im props

2018-10-12 18:56:18 +09:00

WaveformTestBeatmap.cs

Use existing instance of beatmap rather than adding more resources

2018-06-17 19:00:58 +09:00