1786 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master'
  Alex Amadori · 2017-02-18 15:18:26 +01:00
  d92382c1aa
• Implemented sorting in TestCasePlaySong
  Alex Amadori · 2017-02-18 15:11:40 +01:00
  6bbbbd8f96
• Merge pull request #369 from peppy/general-fixes

  General fixes.

  Thomas Müller · 2017-02-18 09:50:48 +01:00
  b92726c8ee
• Bump framework.
  Dean Herbert · 2017-02-18 17:44:49 +09:00
  1524b89753
• Make accuracy fixed width and improve feel.
  Dean Herbert · 2017-02-18 17:35:54 +09:00
  78c9348b5a
• Add padding zeroes to score display (and fix not being applied initially).
  Dean Herbert · 2017-02-18 17:35:37 +09:00
  1a31589abd
• Audio class renames in line with framework changes.
  Dean Herbert · 2017-02-18 17:35:04 +09:00
  32ce8cf723
• General sorting improvements
  Alex Amadori · 2017-02-18 07:59:01 +01:00
  1cd93f79b3
• Merge pull request #365 from peppy/general-fixes

  Better screen hierarchy

  Thomas Müller · 2017-02-18 07:58:03 +01:00
  v2017.218.0 7a29603800
• Fix backgrounds in TestCasePlayer dimming to gray instead of black.
  Dean Herbert · 2017-02-18 15:54:26 +09:00
  cf8b6c0697
• Move constant for default ControlPoint out of Slider.
  Dean Herbert · 2017-02-18 15:54:16 +09:00
  94dd268fd2
• Make disclaimer actually be a thing.
  Dean Herbert · 2017-02-18 14:16:46 +09:00
  bf33cc6f53
• Update framework.
  Dean Herbert · 2017-02-18 13:23:53 +09:00
  76cab600d9
• Fixed BeatmapPanels disappearing
  Alex Amadori · 2017-02-17 23:32:14 +01:00
  6b3ecc28b8
• Fix compilation error introduced in merge conflict resolution.
  Thomas Müller · 2017-02-17 21:27:17 +01:00
  ef775458dd
• Merge branch 'refs/heads/update-framework' into general-fixes
  Thomas Müller · 2017-02-17 21:26:39 +01:00
  04de28d8b2
• Merge branch 'master' of github.com:ppy/osu into general-fixes

  # Conflicts:
  #	osu.Game/Beatmaps/Beatmap.cs

  Thomas Müller · 2017-02-17 21:22:34 +01:00
  1198705a6f
• Don't rely on default relative size of ScrollContainer.
  Thomas Müller · 2017-02-17 20:08:28 +01:00
  4b0d6cd26b
• Merge pull request #366 from OussamaDanba/slider_timingpoint_fix

  Fix beatmap import crash when the first timingPoint starts later than…

  Thomas Müller · 2017-02-17 18:22:55 +01:00
  6a58d7ab2a
• Add comment explaining why the branch is necessary
  Shadoxfix · 2017-02-17 18:17:18 +01:00
  7a45ea58b2
• Implemented basic sorting logic
  Alex Amadori · 2017-02-17 17:41:53 +01:00
  7dcbefd50f
• Fix beatmap import crash when the first timingPoint starts later than a slider
  Shadoxfix · 2017-02-17 17:36:00 +01:00
  72306e8757
• Add better screen hierarchy and placeholder for dev build disclaimer.
  Dean Herbert · 2017-02-17 20:07:16 +09:00
  fe3a6248ec
• GameMode -> Screen.
  Dean Herbert · 2017-02-17 19:23:58 +09:00
  e6ef9f67aa
• Remove outdated comment.
  Dean Herbert · 2017-02-17 17:33:41 +09:00
  366e95dd4f
• Improve exit procedure.
  Dean Herbert · 2017-02-17 17:25:28 +09:00
  9e8b4d43dd
• Fix nullref due to missing controlPoints.
  Dean Herbert · 2017-02-17 15:27:48 +09:00
  0b922365bb
• Merge pull request #364 from peppy/general-fixes

  Design improvements

  Dean Herbert · 2017-02-16 22:49:57 +09:00
  v2017.216.1 ecb840e26f
• Adjust Explode alpha slightly.
  Dean Herbert · 2017-02-16 22:48:47 +09:00
  aaed714160
• Move other score components to centre alignment (and switch font).
  Dean Herbert · 2017-02-16 22:44:41 +09:00
  53e40804ab
• Update Health display design.
  Dean Herbert · 2017-02-16 22:44:21 +09:00
  ca6946c7a2
• Update Key Counter font.
  Dean Herbert · 2017-02-16 22:43:49 +09:00
  9a2beb5979
• Make osu! logo at song select correctly handle mouse focus.
  Dean Herbert · 2017-02-16 22:24:25 +09:00
  04346dbb92
• Merge pull request #362 from Nabile-Rahmani/apply-suggestions

  Fixed "Namespace does not correspond to file location".

  Dean Herbert · 2017-02-16 21:39:42 +09:00
  a3cdbe234e
• Merged upstream/master.
  Nabile Rahmani · 2017-02-16 13:23:11 +01:00
  9c4bb82dd6
• Updated submodule.
  Nabile Rahmani · 2017-02-16 13:09:42 +01:00
  1cdd2a6072
• Namespace does not correspond to file location.
  Nabile Rahmani · 2017-02-16 11:30:31 +01:00
  3068fa1a62
• Merge pull request #359 from Damnae/slider_ticks

  Add slider ticks.

  Thomas Müller · 2017-02-16 10:31:05 +01:00
  v2017.216.0 e10c5644fe
• Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects.
  Dean Herbert · 2017-02-16 17:33:13 +09:00
  b55d85a5c5
• 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
• Add tick sample.
  Dean Herbert · 2017-02-16 13:39:01 +09:00
  2640c2ac43
• Fix namespace.
  Dean Herbert · 2017-02-16 13:37:08 +09:00
  19eb58e724
• Adjust tick appear/disappear animations.
  Dean Herbert · 2017-02-16 13:33:59 +09:00
  97b782128e
• Add a TickDistance to TestCaseHitObjects.
  Dean Herbert · 2017-02-16 13:20:40 +09:00
  c90f5e247d
• Handle case where TickDistance is zero (don't draw ticks).
  Dean Herbert · 2017-02-16 13:20:30 +09:00
  6c9fe544b2
• Merge branch 'master' into slider_ticks
  Dean Herbert · 2017-02-16 11:06:23 +09:00
  23677a309f
• Merge pull request #361 from peppy/general-hitobject-improvements

  General HitObject improvements.

  Thomas Müller · 2017-02-15 19:49:46 +01:00
  d3335f778b
• Rename SliderTicksRenderer to SliderTicksLayer.
  Damnae · 2017-02-15 19:06:54 +01:00
  f1535363f4
• Clearer slider Velocity and TickDistance calculations.
  Damnae · 2017-02-15 18:55:49 +01:00
  b7fca88b4f
• Framework bump.
  Dean Herbert · 2017-02-16 02:41:30 +09:00
  25f65a978b