11306 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into beat-snap-divisor
  Dean Herbert · 2018-03-20 22:26:02 +09:00
  9a5e464c99
• Fixes for keyboard handling and general code quality
  Dean Herbert · 2018-03-20 22:25:15 +09:00
  8ac660b0c6
• Adjust colours and spacing
  Dean Herbert · 2018-03-20 21:59:56 +09:00
  aa8b0d017c
• Make keyboard control work
  Dean Herbert · 2018-03-20 21:38:22 +09:00
  dac1ba21db
• Adjust styling and colours
  Dean Herbert · 2018-03-20 21:31:17 +09:00
  045610dbfe
• DrawableBeatDivisor -> BeatDivisorControl
  Dean Herbert · 2018-03-20 20:10:27 +09:00
  c2eb32c0e9
• Move value change logic to bindable

  Also add drag support

  Dean Herbert · 2018-03-20 20:09:55 +09:00
  6fd650777c
• Merge pull request #2231 from peppy/fix-catch-droplets

  Fix juice stream droplets spawning in incorrect locations

  Dan Balasescu · 2018-03-20 20:06:22 +09:00
  3151940435
• Make bdl beat divisor nullable
  smoogipoo · 2018-03-20 14:01:06 +09:00
  786e6242e1
• Give DrawableBeatDivisor a ctor
  smoogipoo · 2018-03-20 13:57:25 +09:00
  50192b21e3
• Clean up + rename testcase
  smoogipoo · 2018-03-19 20:42:42 +09:00
  fa5fd46f85
• Integrate beat snap divisor into editor seeking
  smoogipoo · 2018-03-19 20:42:06 +09:00
  b1d09500f2
• Actually rename to DrawableBeatDivisor...
  smoogipoo · 2018-03-19 20:34:24 +09:00
  c5eab7a227
• Integrate with dependency injection
  smoogipoo · 2018-03-19 20:33:58 +09:00
  5ecbc5612c
• Fix merge errors
  smoogipoo · 2018-03-19 20:23:31 +09:00
  46f10b392d
• Merge remote-tracking branch 'origin/master' into beat-snap-divisor
  smoogipoo · 2018-03-19 20:23:15 +09:00
  4c0ccffe08
• Rename + renamespace
  smoogipoo · 2018-03-19 20:21:19 +09:00
  df0b8a24c5
• Nest TickContainer in BeatSnapVisualiser
  smoogipoo · 2018-03-19 20:20:29 +09:00
  879dbc75b5
• Integrate into editor's compose screen
  smoogipoo · 2018-03-19 20:14:58 +09:00
  b25c564ecb
• Adjust icon scale + text
  smoogipoo · 2018-03-19 20:14:34 +09:00
  32fecc6ff4
• Offset the icon buttons a little bit to look a bit more centered

  Maybe it's just me, but this is really triggering me.

  smoogipoo · 2018-03-19 20:14:13 +09:00
  e96dad441d
• Add slight easing to marker movements
  smoogipoo · 2018-03-19 19:57:02 +09:00
  c86ddb7ee3
• Add previous/next divisor button actions
  smoogipoo · 2018-03-19 19:55:49 +09:00
  fbc92bfa01
• Privatise tick to TickContainer
  smoogipoo · 2018-03-19 19:52:22 +09:00
  070db63157
• Add divisor text
  smoogipoo · 2018-03-19 19:49:57 +09:00
  7182442b21
• Offset test case a little bit for dynamic compilation message
  smoogipoo · 2018-03-19 19:49:46 +09:00
  66e4e45882
• Merge branch 'master' into fix-catch-droplets
  Dean Herbert · 2018-03-19 19:48:24 +09:00
  f8886c5472
• Add basic structure/layout for the beat snap visualiser
  smoogipoo · 2018-03-19 19:46:26 +09:00
  6b035e8c53
• Merge pull request #2226 from smoogipoo/fix-editor-clocks

  Rewrite the way clocks are handled in the Editor

  Dean Herbert · 2018-03-19 19:19:59 +09:00
  4e4f3fc039
• Merge branch 'master' into fix-editor-clocks
  Dean Herbert · 2018-03-19 19:06:38 +09:00
  4b812279bb
• Merge pull request #2243 from smoogipoo/fix-selectionbox-crash

  Fix crash when attempting to select objects that don't have masks

  Dean Herbert · 2018-03-19 18:58:56 +09:00
  caa2827581
• Fix attempting to add selection boxes with no selection

  E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.

  smoogipoo · 2018-03-19 18:00:11 +09:00
  8d4c9eda48
• Fix missed BDL case
  smoogipoo · 2018-03-19 16:44:46 +09:00
  193142e901
• Pass down editor clocks through DI
  smoogipoo · 2018-03-19 16:27:52 +09:00
  e25d1f6982
• Merge branch 'master' into fix-catch-droplets
  Dean Herbert · 2018-03-19 00:36:05 +09:00
  2c7a18984e
• Fix null-refing testcase

  This would also be fixed with BDL loading children after we're fully loaded ;).

  smoogipoo · 2018-03-16 23:53:55 +09:00
  abb5dcf678
• Merge branch 'master' into fix-editor-clocks
  Dean Herbert · 2018-03-16 23:32:54 +09:00
  4b83278cf4
• Merge pull request #2225 from smoogipoo/editor-wheel-movement

  Implement mousewheel time scrolling in the editor

  Dean Herbert · 2018-03-16 23:31:45 +09:00
  v2018.319.0 cbe2de33c5
• Adjust comment for readability
  smoogipoo · 2018-03-16 19:57:14 +09:00
  6f7163769d
• Merge branch 'master' into fix-catch-droplets
  Dean Herbert · 2018-03-16 19:05:58 +09:00
  7c7f2e2dce
• Merge branch 'master' into editor-wheel-movement
  Dean Herbert · 2018-03-16 18:19:42 +09:00
  e8f7f2c8ab
• Merge pull request #2207 from FreezyLemon/fix-autoplay-button-deselect

  Fix autoplay button wrongly being active after a Ctrl-Enter play

  Dean Herbert · 2018-03-16 18:01:55 +09:00
  1b2e4bb8f7
• Merge branch 'master' into fix-autoplay-button-deselect
  Dean Herbert · 2018-03-16 17:31:14 +09:00
  4411758ff7
• Fix juice stream droplets spawning in incorrect locations

  Closes #2149.

  Dean Herbert · 2018-03-16 17:03:38 +09:00
  8d790e180d
• Merge pull request #2223 from peppy/drawable-composite-hit-object

  Make DrawableHitObject a CompositeDrawable

  Dan Balasescu · 2018-03-16 16:24:26 +09:00
  18615ce8fd
• Fix up breaking taiko changes
  smoogipoo · 2018-03-16 16:10:09 +09:00
  20acc601bb
• Merge branch 'master' into editor-wheel-movement
  Dean Herbert · 2018-03-16 15:56:51 +09:00
  bca4b620b6
• Merge branch 'master' into drawable-composite-hit-object
  Dean Herbert · 2018-03-16 15:53:16 +09:00
  7e7f8ed7a2
• Merge pull request #2219 from Joehuu/mod-fixes

  Improve mods description and adjust multipliers to match stable

  Dean Herbert · 2018-03-16 15:53:04 +09:00
  f640b874df
• Merge branch 'master' into drawable-composite-hit-object
  Dean Herbert · 2018-03-16 15:38:52 +09:00
  23ffee3d38