10747 Commits

This Branch

This Branch

All Branches

• Fix post-merge issues
  smoogipoo · 2018-02-22 14:11:06 +09:00
  604b0fa20a
• Merge branch 'master' into editor-hitobject-overlays
  smoogipoo · 2018-02-22 14:08:36 +09:00
  ded2644df8
• Merge pull request #2094 from smoogipoo/general-slider-improvements

  Expose SliderBody's snaking and border colour

  Dean Herbert · 2018-02-22 13:10:42 +09:00
  cc3546f907
• Merge remote-tracking branch 'upstream/master' into general-slider-improvements
  Dean Herbert · 2018-02-22 12:28:33 +09:00
  3b4e4bd110
• Merge pull request #2097 from smoogipoo/fix-slider-stacking

  Fix stacking not working with sliders

  Dean Herbert · 2018-02-22 11:42:52 +09:00
  8ffb5e2aa7
• Merge branch 'master' into fix-slider-stacking
  Dan Balasescu · 2018-02-21 18:26:34 +09:00
  671f6233c0
• Merge branch 'master' into general-slider-improvements
  Dan Balasescu · 2018-02-21 18:04:26 +09:00
  e097d8dcd3
• Remove unnecessary schedules
  smoogipoo · 2018-02-21 18:02:52 +09:00
  08e52e8c15
• Allow changing accentcolour/bordercolour post-load
  smoogipoo · 2018-02-21 18:00:46 +09:00
  9cd9c83f2c
• Merge pull request #2096 from peppy/update-framework

  Fix some common CI unit test failure causes

  Dan Balasescu · 2018-02-21 17:59:17 +09:00
  7e8b677e17
• Fix OsuAutoGenerator not considering stacking
  smoogipoo · 2018-02-21 17:53:16 +09:00
  0d60a65c94
• Fix stacking not working with sliders

  Fixes #2093.

  smoogipoo · 2018-02-21 17:46:45 +09:00
  f903e6d241
• Rewrite some xmldocs to make methods easier to understand
  smoogipoo · 2018-02-21 17:33:22 +09:00
  f012cce668
• Clean up and document better what "progress" means
  smoogipoo · 2018-02-21 17:10:18 +09:00
  f877b642da
• Attempt to fix beatmap carousel test failures

  As seen here: https://ci.appveyor.com/project/peppy/osu/build/master-7260#L1164
  
  Potentially was continuing operation too early.

  Dean Herbert · 2018-02-21 16:14:45 +09:00
  31edcfa35c
• Update framework
  Dean Herbert · 2018-02-21 16:14:39 +09:00
  cb1ed2fb89
• Merge branch 'master' into editor-hitobject-overlays
  Dan Balasescu · 2018-02-21 12:48:14 +09:00
  e7d17b9578
• Merge branch 'master' into general-slider-improvements
  Dean Herbert · 2018-02-21 11:28:45 +09:00
  50d0278cbd
• Merge pull request #2088 from smoogipoo/osu-rulesetcontainer-aspect

  Move manual OsuPlayfield aspect adjustment into the RulesetContainer method

  Dean Herbert · 2018-02-21 11:05:03 +09:00
  b3424c14f1
• Merge branch 'master' into osu-rulesetcontainer-aspect
  Dean Herbert · 2018-02-21 10:13:44 +09:00
  ba10eb5e50
• Merge branch 'general-slider-improvements' into editor-hitobject-overlays
  smoogipoo · 2018-02-20 23:51:47 +09:00
  7fe0989427
• Allow customizing the snake-ability of sliders
  smoogipoo · 2018-02-20 20:53:06 +09:00
  ee055b8e5c
• Add BorderColour to SliderBody
  smoogipoo · 2018-02-20 20:51:28 +09:00
  8270e4d758
• Add hitobject overlays to selected hitobjects
  smoogipoo · 2018-02-20 18:01:45 +09:00
  ad2f556133
• Merge pull request #2092 from smoogipoo/fix-selection-border-radius

  Combine border radiuses of selection and capture boxes

  Dean Herbert · 2018-02-20 16:00:07 +09:00
  e1a6017df9
• Merge branch 'master' into fix-selection-border-radius
  Dean Herbert · 2018-02-20 15:28:51 +09:00
  cce7855bf9
• Deselect hitobjects that are now not in the selection quad
  smoogipoo · 2018-02-20 15:06:51 +09:00
  2a5bfdb4b8
• Add some xmldocs
  smoogipoo · 2018-02-20 15:06:14 +09:00
  2f4925d031
• Encapsulate logic for selecting/deselecting further
  smoogipoo · 2018-02-20 14:54:45 +09:00
  285df52f43
• Make selectedHitObjects into a HashSet for quick Contains checks
  smoogipoo · 2018-02-20 14:48:35 +09:00
  995ecb7d94
• Merge pull request #2075 from peppy/api-interface

  Improve testability of API

  Dan Balasescu · 2018-02-20 14:46:59 +09:00
  80e6d4fbe4
• Rename + publicise DeselectAll
  smoogipoo · 2018-02-20 14:38:57 +09:00
  87065a0b13
• Combine border radiuses of selection and capture boxes
  smoogipoo · 2018-02-20 14:25:42 +09:00
  423fe4eba8
• Merge branch 'master' into osu-rulesetcontainer-aspect
  Dan Balasescu · 2018-02-20 14:07:04 +09:00
  3d7f998c9b
• Merge remote-tracking branch 'origin/master' into editor-hitobject-movement
  smoogipoo · 2018-02-20 14:03:47 +09:00
  4da93e8f1d
• Add playfield aspect ratio + scaling modifications to composer layers
  smoogipoo · 2018-02-20 14:01:33 +09:00
  8f25a5da66
• Rewrite SelectionLayer testcase to construct an entire HitObjectComposer
  smoogipoo · 2018-02-20 13:50:55 +09:00
  2c37a7e19f
• Extract playfield scaling into a separate class

  And make it more general.

  smoogipoo · 2018-02-20 13:50:31 +09:00
  4a5cd6520c
• Merge branch 'master' into api-interface
  Dean Herbert · 2018-02-20 09:33:53 +09:00
  835136aecb
• Merge pull request #2058 from smoogipoo/editor-hitobject-movement

  Rewrite editor hitobject selections

  Dean Herbert · 2018-02-19 18:23:31 +09:00
  63c8b11c2c
• Merge branch 'master' into editor-hitobject-movement
  Dean Herbert · 2018-02-19 17:59:50 +09:00
  f41a40be15
• Merge pull request #2073 from peppy/storyboard-improvements

  Give storyboards a BeatmapInfo to reduce weird method calls

  Dean Herbert · 2018-02-19 17:59:29 +09:00
  d434852fe6
• Merge branch 'master' into storyboard-improvements
  Dean Herbert · 2018-02-19 17:28:53 +09:00
  fae6ea1ee2
• Merge pull request #2087 from peppy/fix-replay-import

  Fix replay import

  Dan Balasescu · 2018-02-19 17:28:26 +09:00
  6cad316d69
• Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement
  smoogipoo · 2018-02-19 17:07:03 +09:00
  4898c321f8
• Remove AspectAdjust property (override GetAspectAdjustedSize instead)
  smoogipoo · 2018-02-19 17:05:10 +09:00
  b7be162f28
• Adjust xmldoc and rename to GetAspectAdjustedSize
  smoogipoo · 2018-02-19 17:04:18 +09:00
  cd2c9a9de6
• Remove Size override from OsuPlayfield
  smoogipoo · 2018-02-19 17:02:27 +09:00
  ef11ce3dd1
• Add back forgotten score store to valid importers
  Dean Herbert · 2018-02-19 15:52:14 +09:00
  d70d40e3b8
• Merge branch 'master' into storyboard-improvements
  Dan Balasescu · 2018-02-19 15:40:09 +09:00
  34f76a4136