Shane Woolcock 10b91e18bd Merge branch 'master' into samah-ios ...

# Conflicts:
#	osu.Game/osu.Game.csproj

2019-01-19 18:03:58 +10:30

..

Beatmaps

remove blank lines

2019-01-11 10:34:56 +01:00

Chat

Normalize all the line endings

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

NonVisual

Rename NoModMod

2018-11-30 17:35:13 +09:00

Resources

Fix incorrect controlpoint being applied to samples

2018-12-03 17:21:27 +09:00

Scores/IO

Change statistics to be int for now

2018-12-05 19:44:01 +09:00

ScrollAlgorithms

Add IScrollAlgorithm.TimeAt()

2018-11-12 17:43:22 +09:00

Visual

Merge branch 'master' into samah-ios

2019-01-19 18:03:58 +10:30

osu.Game.Tests.csproj

Update framework and other nuget packages

2019-01-16 10:14:37 +09:00

WaveformTestBeatmap.cs

Revert audio changes

2019-01-19 17:40:37 +10:30