56936 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' of github.com:ppy/osu into fix-multi-segment-sliders

  # Conflicts:
  #	osu.Game.Mode.Osu/Objects/Slider.cs

  Thomas Müller · 2016-11-29 22:28:48 +01:00
  e2f279bda4
• Add treatment of slider segments encoded by the same vertex appearing twice in succession.
  Thomas Müller · 2016-11-29 21:31:01 +01:00
  d56e23195d
• Fix being able to hover the back button from outside of its shape.

  Could alternatively done by shearing the entire button, but then you would need a positional x-offset depending on whether the anchor is top or bottom.

  Thomas Müller · 2016-11-29 21:12:49 +01:00
  a456eb6f1b
• Merge pull request #205 from peppy/scoring

  Wire up basic scoring.

  Thomas Müller · 2016-11-29 20:56:53 +01:00
  d0065d2d20
• Fix depth values.
  Thomas Müller · 2016-11-29 20:50:12 +01:00
  b12b82fdd3
• Merge pull request #199 from stanriders/back-button

  Add stable-alike BackButton

  Dean Herbert · 2016-11-30 03:20:03 +09:00
  53df2932ad
• Switch to relative sizes
  stanriders · 2016-11-29 20:27:59 +03:00
  988a9bbaad
• Add *very* basic ranking screen.
  Dean Herbert · 2016-11-29 23:59:56 +09:00
  74e3a87f78
• Adjust slider fadeout slightly.
  Dean Herbert · 2016-11-29 22:14:56 +09:00
  30e62eb53c
• Rename MaximumCombo to HighestCombo.
  Dean Herbert · 2016-11-29 22:05:21 +09:00
  ca0bea7534
• Make ScoreProcessor abstract and avoid making AddJudgement virtual.
  Dean Herbert · 2016-11-29 22:02:37 +09:00
  d71b284642
• Store max combo in ScoreProcessor.
  Dean Herbert · 2016-11-29 21:57:53 +09:00
  eb70ae788c
• Add combo info to JudgementInfo.
  Dean Herbert · 2016-11-29 21:46:30 +09:00
  18d331f869
• Add basic slider judgement handling.
  Dean Herbert · 2016-11-29 21:40:24 +09:00
  f8c1f4dd58
• Tidy up Slider class.
  Dean Herbert · 2016-11-29 21:29:53 +09:00
  a0503bd13f
• Hook up ScoreProcessor to Scoreoverlay etc.
  Dean Herbert · 2016-11-29 21:28:43 +09:00
  2947121e48
• Remove Hit500.
  Dean Herbert · 2016-11-29 21:28:22 +09:00
  9b243ccc23
• Add concept of ScoreProcessor.
  Dean Herbert · 2016-11-29 20:30:16 +09:00
  9d2a69f1e2
• Merge pull request #204 from peppy/general-fixes

  General fixes

  Thomas Müller · 2016-11-29 11:55:29 +01:00
  aea3df257c
• Fix Config regression with DI.
  Dean Herbert · 2016-11-29 18:49:03 +09:00
  fbf35c904d
• Fix volume control fill being incorrect on first display.
  Dean Herbert · 2016-11-29 18:35:59 +09:00
  fa80cc84f8
• Remove silly weld weld weld.
  Dean Herbert · 2016-11-29 18:35:40 +09:00
  139fe873f3
• Basic score flow.
  Dean Herbert · 2016-11-29 17:34:16 +09:00
  9871960112
• Remove redundant property assignments.
  Dean Herbert · 2016-11-29 16:54:54 +09:00
  a47507fff3
• Reset framework to sane version.
  Dean Herbert · 2016-11-29 16:25:06 +09:00
  1c2770ab36
• Reformat code.
  Dean Herbert · 2016-11-29 16:24:37 +09:00
  3526c299ec
• Merge pull request #203 from peppy/slider-loading

  Add interactivity to sliders, follow circle, (non-buffered) paths etc.

  Dean Herbert · 2016-11-29 13:06:00 +09:00
  bb37e5d955
• More consts, less crap (probably)
  stanriders · 2016-11-29 05:36:48 +03:00
  2ecf72d0d7
• Improve slider rendering by using a buffered container (with depth attachment) and proper alpha blending.
  Thomas Müller · 2016-11-29 11:14:01 +09:00
  0b8e37fb1d
• Fix compile issues.
  Dean Herbert · 2016-11-28 23:05:05 +09:00
  a506e91b7c
• Remove silly static using statement.
  Dean Herbert · 2016-11-28 22:48:28 +09:00
  49470318f2
• Cast less.
  Dean Herbert · 2016-11-28 22:47:50 +09:00
  785ae892f4
• Change double to int.
  Dean Herbert · 2016-11-28 22:46:52 +09:00
  9114c9dec4
• Remove unnecessary null check.
  Dean Herbert · 2016-11-28 22:46:07 +09:00
  ce13d813b7
• Update framework.
  Dean Herbert · 2016-11-28 20:09:20 +09:00
  f224960429
• Make tracking area larger.
  Dean Herbert · 2016-11-28 19:51:50 +09:00
  ad761eb66a
• Add interactivity to sliders, follow circle etc.
  Dean Herbert · 2016-11-28 19:42:45 +09:00
  c7ffd56a10
• Delay snaking slightly.
  Dean Herbert · 2016-11-28 18:53:59 +09:00
  907e8e83ce
• Don't store beatmap reference in hitobjects.
  Dean Herbert · 2016-11-28 18:45:50 +09:00
  187a8bbfa7
• Centralise common state setting for osu HitObjects.
  Dean Herbert · 2016-11-28 18:40:54 +09:00
  c376f8436c
• Improve snaking logic.
  Dean Herbert · 2016-11-28 18:40:38 +09:00
  15096c2f00
• Fix incorrect slider duration calculation.
  Dean Herbert · 2016-11-28 17:55:19 +09:00
  899c341fd3
• Refactor SliderBody into its own class.
  Dean Herbert · 2016-11-28 17:05:30 +09:00
  9eb3e1168e
• Add basic snaking.
  Dean Herbert · 2016-11-28 16:52:57 +09:00
  622c90daf7
• Adjust velocity calculation.
  Dean Herbert · 2016-11-28 16:31:31 +09:00
  2616d05767
• Add basic slider ball logic.
  Dean Herbert · 2016-11-28 16:31:19 +09:00
  b1f141e1a0
• Improve curve visualisation.
  Dean Herbert · 2016-11-28 16:28:47 +09:00
  b999d92ffb
• Add better slider duration calculation using bpm and difficulty information.
  Dean Herbert · 2016-11-28 15:31:54 +09:00
  bf63be0602
• Add basic ControlPoint parsing.
  Dean Herbert · 2016-11-28 15:12:11 +09:00
  a5651427f6
• General fix-ups for slider class.
  Dean Herbert · 2016-11-28 12:40:24 +09:00
  e271bcec63