16 Commits

• Fix sliders playing hitsound twice at end.
  Dean Herbert · 2017-02-22 13:51:40 +09:00
  00ddcb11b4
• Add the concept of nested DrawableHitObjects.

  - Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
  - Removed SliderTicksLayer abstraction for now.

  Dean Herbert · 2017-02-16 17:02:36 +09:00
  8bf3902cbd
• Merge branch 'master' into slider_ticks
  Dean Herbert · 2017-02-16 11:06:23 +09:00
  23677a309f
• Add combo numbers.
  Dean Herbert · 2017-02-15 23:23:55 +09:00
  7fbc5990d1
• Merge branch 'master' into slider_ticks

  Conflicts:
  	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
  	osu.Game.Modes.Osu/Objects/Slider.cs

  Damnae · 2017-02-15 10:53:42 +01:00
  e2fae24ad5
• Handle proxied approach layer better and add slider's approach circle (previously missing).
  Dean Herbert · 2017-02-15 01:23:19 +09:00
  fc192906ea
• Add slider ticks.
  Damnae · 2017-02-14 11:26:24 +01:00
  3e7208c8a4
• Add StackedPosition/StackedEndPosition and offset slider curves by StackOffset.
  Damnae · 2017-02-09 08:29:21 +01:00
  a79fde897b
• Add hit object stacking.
  Damnae · 2017-02-09 07:28:40 +01:00
  38b25a7df3
• Update and standardise license headers.
  Dean Herbert · 2017-02-07 14:27:41 +09:00
  50bd80cb0c
• Remove all @2x references, updates resource and framework.
  Dean Herbert · 2017-02-06 22:19:47 +09:00
  9b9ed32245
• Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
  Thomas Müller · 2017-02-05 09:40:58 +01:00
  8271b139e9
• Merge branch 'master' into hit-samples

  # Conflicts:
  #	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs

  Dean Herbert · 2016-12-13 17:57:24 +09:00
  c420c55291
• Wire up CircleSize to hitobjects.

  Note, that circle sizes still are wrong compared to stable osu. In order to fix this, the base radius of hitcircles needs to become 64, but it currently is 72.

  Thomas Müller · 2016-12-11 10:11:22 +01:00
  eef697d842
• Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples
  Dean Herbert · 2016-12-08 21:41:02 +09:00
  8329022a2e
• Fix incorrect folder name.
  Dean Herbert · 2016-12-08 21:36:34 +09:00
  40ea6e0d72