45041 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'refs/remotes/upstream/master' into input-handler-improvements
  Dean Herbert · 2016-11-22 12:37:57 +09:00
  070c7dc621
• Merge pull request #181 from peppy/general-fixes

  Fix unit tests failing.

  Dean Herbert · 2016-11-22 12:30:49 +09:00
  caf7199857
• Update framework.
  Dean Herbert · 2016-11-22 12:26:18 +09:00
  b0dfcf5429
• Update input handler logic to match framework changes.
  Dean Herbert · 2016-11-21 21:36:11 +09:00
  3e9c398652
• Add finalizer logic for WorkingBeatmap for now.
  Dean Herbert · 2016-11-21 21:35:10 +09:00
  41a84ba00c
• Smoother movement within song select.
  Thomas Müller · 2016-11-21 07:59:46 +01:00
  d32f11b5e2
• Fix unit tests failing.
  Dean Herbert · 2016-11-21 12:34:03 +09:00
  027d71ffd8
• Merge remote-tracking branch 'refs/remotes/Tom94/song-select-wedged-box'

  # Conflicts:
  #	osu-framework

  Dean Herbert · 2016-11-21 12:07:07 +09:00
  ac8c180168
• Merge pull request #179 from Tom94/beatmap-backgrounds

  Update the background according to the currently selected beatmap and…

  Dean Herbert · 2016-11-21 11:57:17 +09:00
  0e27d2ba2f
• Fix broken VisualTests SongSelect.
  Thomas Müller · 2016-11-20 20:43:43 +01:00
  318fe2f9d6
• Initial implementation of a beatmap carousell and various minor improvements to song select.

  No big optimizations yet, but groundwork is laid out.

  Thomas Müller · 2016-11-20 20:34:16 +01:00
  c6d688898f
• Adjust size of wedged background overlay.
  Thomas Müller · 2016-11-20 12:29:38 +01:00
  40805ad32c
• Update framework and add rudimentary fading to song select screen.
  Thomas Müller · 2016-11-20 12:16:54 +01:00
  57e7c7097d
• Add wedged background overlay to song select.
  Thomas Müller · 2016-11-20 10:02:20 +01:00
  0fdd505807
• Update framework.
  Dean Herbert · 2016-11-20 09:38:11 +09:00
  b13cfd43e9
• Update the background according to the currently selected beatmap and blur it within song select.
  Thomas Müller · 2016-11-19 17:39:43 +01:00
  f8788bb24b
• Merge pull request #177 from peppy/play-mode-improvements

  Add simple implementation of HitExplosions.

  Thomas Müller · 2016-11-19 13:38:56 +01:00
  9d88bb4736
• Update framework.
  Dean Herbert · 2016-11-19 19:35:37 +09:00
  616f3375a4
• Fit HitExplosion regression.
  Dean Herbert · 2016-11-19 19:14:55 +09:00
  d3bf1a3a9e
• Standardise some naming and make hitcircles feel better.
  Dean Herbert · 2016-11-19 19:07:57 +09:00
  3ac89216bd
• Make HitCircles work without using ChildScale.
  Dean Herbert · 2016-11-19 16:32:48 +09:00
  d359057db6
• Fix regressions in combo counters and tidy up naming of SpriteTexts.
  Dean Herbert · 2016-11-19 16:19:54 +09:00
  acb85d0140
• Add the concept of a HitJudgementResolver.
  Dean Herbert · 2016-11-19 16:19:26 +09:00
  1242ae3f2a
• Clean up usings.
  Dean Herbert · 2016-11-19 13:20:05 +09:00
  bed50a53a7
• Merge remote-tracking branch 'refs/remotes/upstream/master' into play-mode-improvements
  Dean Herbert · 2016-11-18 19:28:00 +09:00
  7ce9eca773
• Merge pull request #178 from peppy/general-fixes

  Update framework.

  Dean Herbert · 2016-11-18 19:27:22 +09:00
  340e1b3a9c
• Update framework.
  Dean Herbert · 2016-11-18 19:12:37 +09:00
  75e1c2ffbf
• Split ApproachCircle out into its own class.
  Dean Herbert · 2016-11-18 17:47:47 +09:00
  4db2a1e693
• Make slider parsing kind of exist.
  Dean Herbert · 2016-11-18 17:40:06 +09:00
  4c61a13e71
• Shuffle namespaces and make hitcircle pieces reusable by other objects.
  Dean Herbert · 2016-11-17 17:21:23 +09:00
  bd8856611a
• Add simple implementation of HitExplosions.
  Dean Herbert · 2016-11-16 19:24:48 +09:00
  885df47864
• Don't initialise children in load().
  Dean Herbert · 2016-11-16 16:59:34 +09:00
  4e2e7ec8ba
• Fix incorrect blending mode on triangles.
  Dean Herbert · 2016-11-16 16:29:19 +09:00
  353b9c0789
• DrawableCircle -> DrawableHitCircle.
  Dean Herbert · 2016-11-16 16:20:58 +09:00
  fba748b24e
• Circle -> HitCircle.
  Dean Herbert · 2016-11-16 16:16:45 +09:00
  da1f6eeab5
• Fix rulesets not being registered for VisualTests.
  Dean Herbert · 2016-11-16 15:49:59 +09:00
  37edbd355e
• Tidy up Player.cs.
  Dean Herbert · 2016-11-16 15:48:35 +09:00
  b61521a93c
• Merge pull request #171 from huoyaoyuan/improvements

  Various improvements

  Dean Herbert · 2016-11-16 12:00:55 +09:00
  42d2d39ade
• Expression body and spacing.
  Huo Yaoyuan · 2016-11-16 10:53:10 +08:00
  95600f872d
• Merge branch 'master'
  Huo Yaoyuan · 2016-11-16 10:51:39 +08:00
  53deaf2a00
• Merge pull request #176 from Tom94/simpler-gradient

  Use gradient helper function to create toolbar tooltip gradient.

  Dean Herbert · 2016-11-16 11:18:31 +09:00
  89bb87a6f3
• Update framework.
  Dean Herbert · 2016-11-16 09:20:43 +09:00
  26e9c9fcb6
• Merge pull request #175 from Tom94/fix-broken-option-checkbox

  Fix option checkbox losing its glow incorrectly in certain cases.

  Dean Herbert · 2016-11-16 03:12:23 +09:00
  da00c65e50
• Fix option checkbox losing its glow incorrectly in certain cases.
  Thomas Müller · 2016-11-15 19:11:36 +01:00
  e049f8582a
• Use gradient helper function to create toolbar tooltip gradient.
  Thomas Müller · 2016-11-15 19:09:30 +01:00
  746c28246f
• Merge pull request #174 from peppy/general-fixes

  General fixes

  Thomas Müller · 2016-11-15 18:20:48 +01:00
  696d21f762
• Merge pull request #173 from peppy/options-design-improvements

  Add an implementation of the new design of checkboxes.

  Thomas Müller · 2016-11-15 18:13:46 +01:00
  eb1b9e73d7
• Update framework.
  Dean Herbert · 2016-11-16 01:36:35 +09:00
  b332ab2c97
• ShowToolbar -> ShowOverlays; include MusicController.
  Dean Herbert · 2016-11-15 20:55:57 +09:00
  d846246ef2
• Render musicController above toolbar.
  Dean Herbert · 2016-11-15 20:55:55 +09:00
  2af839cdbd