24822 Commits

This Branch

This Branch

All Branches

• 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
• Improve the feel of spinners.
  Dean Herbert · 2017-02-15 23:24:08 +09:00
  31a617363a
• Add combo numbers.
  Dean Herbert · 2017-02-15 23:23:55 +09:00
  7fbc5990d1
• Fix SliderBall weirdness (not correctly staying circular).

  Also adjusts tracking to only change during sldier active time.

  Dean Herbert · 2017-02-15 21:51:16 +09:00
  bab219c428
• Replace all usage of SpriteText with OsuSpriteText.
  Dean Herbert · 2017-02-15 21:37:43 +09:00
  67105e6dfd
• Avoid glow fading out early on spinners.
  Dean Herbert · 2017-02-15 21:05:46 +09:00
  ce859196d5
• Combine triangle system implementations.
  Dean Herbert · 2017-02-15 20:39:10 +09:00
  12e265a3e2
• 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
• Merge pull request #360 from peppy/general-fixes

  Change inspection settings.

  Dean Herbert · 2017-02-15 16:33:27 +09:00
  7fc035835b
• Change inspection settings.

  UnusedMember_002ELocal: Warning -> Hint
  VirtualMemberCallInConstructor: Warning -> Hint

  Dean Herbert · 2017-02-15 16:24:39 +09:00
  f8e1006fcd
• Make mode selector selected line non-relative. (#352)

  * mode selector line has the correct length now
  * calculation is now a 'one-liner'
  * Line length is absolute now
  * Line length is calculated inline

  Jorolf · 2017-02-15 13:48:49 +09:00
  d42c5481b0
• Reset local version and explicitly show release/debug builds.
  Dean Herbert · 2017-02-15 13:41:12 +09:00
  25e7a08cca
• Merge pull request #358 from peppy/spinners

  Add spinners and improve TestCaseHitObjects.

  Dean Herbert · 2017-02-15 12:58:21 +09:00
  v2017.215.0 bd4902a532
• Handle cases where HitObjects were not parsed.
  Dean Herbert · 2017-02-15 12:38:10 +09:00
  d570a6d308
• Display Important/Error logging in notifications for now.
  Dean Herbert · 2017-02-15 12:37:57 +09:00
  753232533a
• Don't use osu! mode parser for other game modes for now (convert still works).
  Dean Herbert · 2017-02-15 12:36:47 +09:00
  580584a015
• Throw exception on unknown hitobject.
  Dean Herbert · 2017-02-15 11:37:23 +09:00
  f2b0fd4de0
• Merge branch 'master' of https://github.com/ppy/osu
  Jorolf · 2017-02-14 20:17:44 +01:00
  a8271d02d8
• Merge branch 'master' into spinners
  Dean Herbert · 2017-02-15 01:32:54 +09:00
  5873178df3
• Update framework.
  Dean Herbert · 2017-02-15 01:29:51 +09:00
  325054c7f7
• Merge pull request #354 from peppy/builder

  Deploy automation

  Dean Herbert · 2017-02-15 01:28:05 +09:00
  ba7b61521f
• Add spinners and improve TestCaseHitObjects.
  Dean Herbert · 2017-02-15 01:23:20 +09:00
  10dfe47638
• Add the ability to make DrawableHitObjects non-interactive (for use in other contexts).
  Dean Herbert · 2017-02-15 01:23:20 +09:00
  8e9a5e9faa
• Better slider defaults.
  Dean Herbert · 2017-02-15 01:23:19 +09:00
  396c8121d3
• Ensure SliderCurve is assigned Calculated before used.
  Dean Herbert · 2017-02-15 01:23:19 +09:00
  e88d02d3c4
• Handle proxied approach layer better and add slider's approach circle (previously missing).
  Dean Herbert · 2017-02-15 01:23:19 +09:00
  fc192906ea
• Make HitObjectType more accessible.

  # Conflicts:
  #	osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs

  Dean Herbert · 2017-02-15 01:23:19 +09:00
  9a5ac64332
• Merge pull request #357 from peppy/general-fixes

  General fixes.

  Thomas Müller · 2017-02-14 17:22:31 +01:00
  9f96a511a7
• Merge branch 'master' into general-fixes
  Dean Herbert · 2017-02-15 01:14:25 +09:00
  13ed7db361
• Merge pull request #355 from peppy/disable-unimplemented-options

  Visually disable options which aren't yet wired up.

  Thomas Müller · 2017-02-14 17:11:01 +01:00
  7fa9dde24f
• Fix slider ticks expiring before scoring happens.
  Damnae · 2017-02-14 16:12:35 +01:00
  ace7a1d009
• Line length is calculated inline
  Jorolf · 2017-02-14 16:05:57 +01:00
  e717daa504