10 Commits

• Merge remote-tracking branch 'origin/master' into disallow-beatmap-change

  # Conflicts:
  #	osu.Game/Overlays/Music/PlaylistOverlay.cs
  #	osu.Game/Screens/OsuScreen.cs

  smoogipoo · 2018-05-28 18:01:15 +09:00
  a3470f9ec3
• Apply requested changes
  AlFasGD · 2018-05-21 13:23:39 +03:00
  a54bda6ce1
• Simplify expression
  AlFasGD · 2018-05-12 15:09:53 +03:00
  2a90686da6
• Fix tests and implementation
  AlFasGD · 2018-05-08 16:37:06 +03:00
  e44062b77a
• Prevent user from scrolling outside the timeline in the editor
  AlFasGD · 2018-05-08 16:21:54 +03:00
  dd9b9a18ac
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Fix smoogipoo's comments
  Dean Herbert · 2018-04-12 21:17:17 +09:00
  127f0d7b01
• Add some missing xmldoc
  Dean Herbert · 2018-04-12 21:04:45 +09:00
  0ca703beaa
• Remove re-instantiation of clock in EditorClockTestCase
  smoogipoo · 2018-04-06 18:38:44 +09:00
  e59124962c
• Give editor a custom clock to handle seeking
  smoogipoo · 2018-04-06 18:11:37 +09:00
  c7abd56fc4