7091 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into mania-hit-explosions
  Dean Herbert · 2017-09-11 17:34:14 +09:00
  7b92bbfa86
• Merge pull request #1233 from smoogipooo/mania-holdnote-niceness

  Update osu!mania notes + hold notes with glows

  Dean Herbert · 2017-09-11 17:33:03 +09:00
  311f4744f6
• Fix CI error
  smoogipooo · 2017-09-11 15:43:23 +09:00
  54aff432fe
• Add missing license header
  Dan Balasescu · 2017-09-11 15:24:28 +09:00
  6ecd530d7b
• Merge remote-tracking branch 'origin/master' into mania-holdnote-niceness
  smoogipooo · 2017-09-11 15:14:49 +09:00
  e5808d4680
• Merge branch 'master' into mania-hit-explosions
  Dean Herbert · 2017-09-11 15:14:35 +09:00
  838fcca9c4
• Merge pull request #1231 from smoogipooo/blending-equations

  Update BlendingMode usages to reflect framework changes

  Dean Herbert · 2017-09-11 15:14:18 +09:00
  73b5940498
• Merge branch 'blending-equations' into mania-holdnote-niceness
  smoogipooo · 2017-09-11 15:09:01 +09:00
  f3c6f6f959
• Better variable + comment naming
  smoogipooo · 2017-09-11 15:08:51 +09:00
  de7d50d384
• Update framework.
  smoogipooo · 2017-09-11 15:02:30 +09:00
  6c4f507e39
• Merge remote-tracking branch 'origin/master' into blending-equations

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-09-11 15:02:12 +09:00
  58c875bdca
• Merge remote-tracking branch 'origin/master' into mania-hit-explosions
  smoogipooo · 2017-09-11 14:48:40 +09:00
  4683319156
• Make tick explosions white and lower scale.
  smoogipooo · 2017-09-11 14:37:34 +09:00
  e8efdcf188
• Merge pull request #1238 from peppy/fix-autoplay

  Fix regression causing autoplay to fail

  Dan Balasescu · 2017-09-11 14:32:29 +09:00
  a9ad02c29f
• Fix regression causing autoplay to fail
  Dean Herbert · 2017-09-11 14:25:01 +09:00
  512232c1c8
• Remove green coloration when hit.
  smoogipooo · 2017-09-11 13:56:10 +09:00
  2c3131d391
• Improve test case a little bit.
  smoogipooo · 2017-09-11 13:55:34 +09:00
  9e3206fef3
• Add explosions.
  smoogipooo · 2017-09-11 13:44:39 +09:00
  3026675f35
• Set default AccentColour for hit objects
  smoogipooo · 2017-09-11 13:44:05 +09:00
  0cadee998c
• Merge pull request #1237 from peppy/update-managedbass-retarget

  Update framework and target .NET 4.6.1

  Dean Herbert · 2017-09-11 12:57:13 +09:00
  9d6571a1cb
• Pass down OnJudgement to columns.
  smoogipooo · 2017-09-11 12:57:10 +09:00
  10f0d1f20d
• Update submodules
  Dean Herbert · 2017-09-11 12:52:25 +09:00
  712c6942a9
• Target .NET 4.6.1
  Dean Herbert · 2017-09-11 12:39:00 +09:00
  7170fbd087
• Merge pull request #1222 from DrabWeb/beatmap-details-rewrite

  Beatmap details rewrite

  Dean Herbert · 2017-09-11 12:36:44 +09:00
  81d04ea959
• Merge branch 'master' into beatmap-details-rewrite
  Dean Herbert · 2017-09-11 12:30:32 +09:00
  adba5b5ba6
• Merge pull request #1235 from peppy/nullref-fix

  Fix nullref when loading MusicController VisualTest after Player VisualTest

  Dean Herbert · 2017-09-11 12:23:29 +09:00
  71fe39244b
• Merge branch 'master' into nullref-fix
  Dan Balasescu · 2017-09-11 12:13:43 +09:00
  24f7b6823e
• Merge pull request #1236 from peppy/ci-refixes

  Fix newly occurring CI issues

  Dan Balasescu · 2017-09-11 12:02:34 +09:00
  01b294e6b5
• Fix a false resharper positive
  Dean Herbert · 2017-09-11 11:41:29 +09:00
  3cacee300a
• Add nullref check in KeyCounterCollection's Add method
  Dean Herbert · 2017-09-11 11:41:09 +09:00
  eedfbdc0e8
• Update framework
  Dean Herbert · 2017-09-11 11:34:40 +09:00
  4f6c93aa0f
• Fix nullref when loading MusicController VisualTest after Player VisualTest
  Dean Herbert · 2017-09-11 11:18:53 +09:00
  8d919e42c9
• Rework mania playfield to be more sane with masking/nesting.
  smoogipooo · 2017-09-11 10:46:54 +09:00
  42dc4d9b1c
• Merge branch 'master' into beatmap-details-rewrite
  Dean Herbert · 2017-09-11 10:18:34 +09:00
  cb24b5c436
• Update with framework changes.
  smoogipooo · 2017-09-11 08:59:56 +09:00
  2f72dff779
• Merge pull request #1234 from peppy/fix-volume-wheel

  Fix individual volume controls not being adjustable via wheel

  Dan Balasescu · 2017-09-11 08:37:00 +09:00
  d42aab96d1
• Fix individual volume controls not being adjustable via wheel

  They were blocking each others' input unnecessarily.

  Dean Herbert · 2017-09-11 08:27:29 +09:00
  f33bd700c5
• Fix hold note tick input.
  smoogipooo · 2017-09-11 04:51:44 +09:00
  2086ed209d
• Fix hold note tick position + lifetime.
  smoogipooo · 2017-09-11 04:45:10 +09:00
  9cd3af11d5
• Remove now unnecessary comment.
  smoogipooo · 2017-09-11 04:39:04 +09:00
  79a9612243
• More TestCaseManiaHitObjects fixes.
  smoogipooo · 2017-09-11 04:34:30 +09:00
  8bb8999820
• Better updateGlow methods.
  smoogipooo · 2017-09-11 04:29:32 +09:00
  3b5e847a31
• Add glow to DrawableHoldNote
  smoogipooo · 2017-09-11 04:22:17 +09:00
  590a34dc28
• Add glow to DrawableNote
  smoogipooo · 2017-09-11 04:22:05 +09:00
  73d77637ef
• Update body styling of hold notes
  smoogipooo · 2017-09-11 04:21:43 +09:00
  8797382700
• Make TestCaseManiaHitObjects work again.
  smoogipooo · 2017-09-11 03:50:16 +09:00
  4d77a81e40
• Merge branch 'blending-equations' into mania-holdnote-niceness
  smoogipooo · 2017-09-11 03:49:17 +09:00
  e876efcc02
• Update framework.
  smoogipooo · 2017-09-11 03:37:13 +09:00
  af07d5cc51
• Merge remote-tracking branch 'origin/master' into blending-equations

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-09-11 02:42:23 +09:00
  cde22865b9
• Merge pull request #1219 from naoey/fix-mono-crash

  Fix startup crash on mono.

  Dean Herbert · 2017-09-10 11:58:58 +09:00
  7d4ca40965