11269 Commits

This Branch

This Branch

All Branches

• 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
• Use a decoupled clock for accurate clock times
  smoogipoo · 2018-03-15 17:03:33 +09:00
  9e0aeec574
• Add more testcases + fix up seeking a bit more
  smoogipoo · 2018-03-15 15:40:52 +09:00
  50f9d810dd
• Merge branch 'master' into api-as-component
  Dean Herbert · 2018-03-15 14:13:23 +09:00
  0474b7ca2d
• Make DrawableHitObject a CompositeDrawable

  No reason for it to be a container.

  Dean Herbert · 2018-03-15 13:41:06 +09:00
  a42035f494
• Merge branch 'master' into DoNotMoveToPlayerWhileDragging
  Dean Herbert · 2018-03-15 11:14:30 +09:00
  cdf435aedd
• Merge branch 'master' into cursor-trail
  Dean Herbert · 2018-03-15 11:14:21 +09:00
  8d433cb4bf
• Add forward snapping from inbetween beat test
  smoogipoo · 2018-03-14 23:08:43 +09:00
  f693fbf92d
• Merge branch 'master' into fix-autoplay-button-deselect
  Dean Herbert · 2018-03-14 21:46:19 +09:00
  551b67ac16
• Add some basic tests + fixes to seek/seekforward functionality
  smoogipoo · 2018-03-14 20:52:48 +09:00
  0da3ae0944
• small code cleanups
  FreezyLemon · 2018-03-14 12:38:22 +01:00
  070decf890
• make SelectTypes set mods instead of only adding new ones

  also made the method actually take types as parameter to make it consistent

  FreezyLemon · 2018-03-14 12:33:08 +01:00
  a438e45434
• Change descriptions and special section
  Joseph Madamba · 2018-03-14 01:05:19 -07:00
  1eeacb7bf7
• Merge pull request #2195 from smoogipoo/editor-hitobject-movement

  Implement an interface for moving hitobjects in the editor

  Dean Herbert · 2018-03-14 15:55:15 +09:00
  edd053fcd2
• Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
  Dean Herbert · 2018-03-14 15:35:24 +09:00
  a0691168cb
• Rework a lot of naming and structure
  Dean Herbert · 2018-03-14 15:18:21 +09:00
  81f82d98a1
• Update framework
  Dean Herbert · 2018-03-14 13:55:16 +09:00
  149ee381e9
• Merge remote-tracking branch 'upstream/master' into api-as-component
  Dean Herbert · 2018-03-14 13:54:17 +09:00
  1d01dbd462
• Merge branch 'master' into fix-combo-colours
  Dean Herbert · 2018-03-14 12:45:48 +09:00
  d42cd5c8f0
• Merge pull request #2169 from smoogipoo/fix-mania-conversion

  Make osu!mania conversions more in-line with osu!stable

  Dean Herbert · 2018-03-14 12:35:13 +09:00
  4a3145f08b
• Merge branch 'master' into fix-mania-conversion
  Dean Herbert · 2018-03-14 12:27:32 +09:00
  908d38279b