11289 Commits

This Branch

This Branch

All Branches

• 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
• 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
• 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 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
• 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
• Merge branch 'master' into mod-fixes
  Dean Herbert · 2018-03-16 15:38:41 +09:00
  46f5c0fc19
• Merge pull request #2218 from peppy/api-as-component

  Consolidate API into its own component

  Dan Balasescu · 2018-03-16 15:38:17 +09:00
  39bf393682
• Update submodules
  smoogipoo · 2018-03-16 15:24:47 +09:00
  2ba2556d2a
• Merge master into api-as-component
  smoogipoo · 2018-03-16 15:22:48 +09:00
  aa82393824
• Merge pull request #2215 from peppy/fix-combo-colours

  Fix beatmap combo colours not being applied

  Dan Balasescu · 2018-03-16 15:19:43 +09:00
  41036ab79e
• Merge branch 'master' into fix-combo-colours
  Dan Balasescu · 2018-03-16 14:59:45 +09:00
  cdc61d5f0d
• Merge pull request #2170 from peppy/cursor-trail

  Make gameplay cursor vs skip button feel nice again

  Dan Balasescu · 2018-03-16 14:57:00 +09:00
  e406cf2207
• Merge branch 'master' into cursor-trail
  smoogipoo · 2018-03-16 14:43:27 +09:00
  b27b6c7eb7
• Update submodules
  smoogipoo · 2018-03-16 14:43:14 +09:00
  7ded1635fa
• Merge pull request #2078 from UselessToucan/DoNotMoveToPlayerWhileDragging

  Improve mouse-based load inhibition at player loading screen

  Dan Balasescu · 2018-03-16 14:31:19 +09:00
  b39c04e122
• Merge branch 'master' into mod-fixes
  Dean Herbert · 2018-03-16 11:27:39 +09:00
  7ed84465fb
• Re-order methods
  smoogipoo · 2018-03-15 18:28:08 +09:00
  fc15c63a88
• Fix not being able to scroll before the first timing point
  smoogipoo · 2018-03-15 18:26:53 +09:00
  c937ef5d24
• Fix testcases
  smoogipoo · 2018-03-15 18:24:57 +09:00
  8fbaa86e64
• Pass adjustable clocks to components, rather than relying on the track
  smoogipoo · 2018-03-15 18:19:28 +09:00
  d05947ef48
• Move clock construction to Editor
  smoogipoo · 2018-03-15 17:27:37 +09:00
  c8f6a6980b
• Move editor constructions to BDL load
  smoogipoo · 2018-03-15 17:10:08 +09:00
  5e742eb466