12894 Commits

This Branch

This Branch

All Branches

• Merge pull request #2831 from ThePyrotechnic/ShowMorePadding

  Add padding to "show more" button

  Dean Herbert · 2018-06-20 12:27:47 +09:00
  a01a0b7d52
• Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding
  Dean Herbert · 2018-06-20 10:45:43 +09:00
  3eb0a17978
• Use vertical/horizontal pair instead
  Dean Herbert · 2018-06-20 10:45:35 +09:00
  d7f65d62e0
• Merge pull request #2838 from tom-arrow/ruleset-container

  RulesetContainer<TObject> cannot be derived

  Dean Herbert · 2018-06-20 10:36:31 +09:00
  03db19eb9c
• Merge branch 'master' into ruleset-container
  Dan Balasescu · 2018-06-19 21:47:10 +09:00
  77e03a59a9
• RulesetContainer<TObject> cannot be derived
  Tom Arrow · 2018-06-19 14:31:24 +02:00
  ad883e087a
• Merge pull request #2836 from peppy/update-framework

  Update framework

  Dean Herbert · 2018-06-19 21:12:16 +09:00
  2018.618.0 58b551b98e
• Merge branch 'master' into update-framework
  Dan Balasescu · 2018-06-19 20:57:19 +09:00
  0b1b3319aa
• Update framework
  Dean Herbert · 2018-06-19 20:19:52 +09:00
  3819ecb2be
• Merge pull request #2829 from tom-arrow/reverse-arrow-fix

  Fix reverse arrow displayed with incorrect angle

  Dean Herbert · 2018-06-19 20:17:16 +09:00
  b9d63ee7b1
• Merge branch 'master' into reverse-arrow-fix
  Dean Herbert · 2018-06-19 20:06:37 +09:00
  cb24957c62
• Merge pull request #2833 from peppy/update-configuration-names

  Update rider configuration names

  Dan Balasescu · 2018-06-19 18:42:41 +09:00
  c1c95dfe84
• Update rider configuration names
  Dean Herbert · 2018-06-19 18:09:02 +09:00
  15f3a05c83
• Add padding to 'show more' button
  Michael Manis · 2018-06-18 19:14:44 -04:00
  a0f1143287
• Fix reverse arrow displayed with incorrect angle
  Tom Arrow · 2018-06-18 17:22:01 +02:00
  4aa89de2d7
• Merge pull request #2631 from smoogipoo/compose-timeline-colours

  Colourise the editor waveform

  Dean Herbert · 2018-06-18 04:39:49 +09:00
  ec81ed1c8d
• Add some colours to the compose-mode timeline
  Dean Herbert · 2018-06-18 04:31:47 +09:00
  b1d059a67d
• Merge pull request #2780 from smoogipoo/timeline-markers

  Add centre marker to the editor timeline

  Dean Herbert · 2018-06-18 03:42:04 +09:00
  60d1295bc6
• Remove scrollbar depth change as scrollbar is hidden now
  Dean Herbert · 2018-06-18 03:19:21 +09:00
  bec6e3083e
• Merge branch 'master' into timeline-markers
  Dean Herbert · 2018-06-18 03:14:04 +09:00
  d58ef96a23
• Merge pull request #2783 from smoogipoo/timeline-input-adjustment

  Make the editor timeline zoom on mouse scroll

  Dean Herbert · 2018-06-18 03:11:17 +09:00
  e89155f87c
• Add a comment about precision scroll behaviour
  Dean Herbert · 2018-06-18 03:03:09 +09:00
  31f9d0161d
• Merge branch 'master' into timeline-input-adjustment
  Dean Herbert · 2018-06-18 02:54:25 +09:00
  ae160baa6e
• Merge branch 'master' into timeline-markers
  Dean Herbert · 2018-06-18 02:09:20 +09:00
  48613ea1f6
• Merge pull request #2804 from smoogipoo/mania-keymod-optimisation

  Don't compute keymod difficulties for mania-specific beatmap

  Dean Herbert · 2018-06-18 02:07:02 +09:00
  62a2a5fbb4
• Avoid listing the base mods twice
  Dean Herbert · 2018-06-18 00:48:35 +09:00
  6fa72c510f
• Merge branch 'master' into mania-keymod-optimisation
  Dean Herbert · 2018-06-18 00:42:26 +09:00
  bf958d736b
• Merge pull request #2777 from smoogipoo/fix-taiko-proxies

  Make taiko hitobjects properly unproxy when rewound

  Dean Herbert · 2018-06-18 00:41:08 +09:00
  c09b3f2a02
• Move proxy state check to base class
  Dean Herbert · 2018-06-18 00:27:18 +09:00
  5b344525e1
• Merge branch 'master' into fix-taiko-proxies
  Dean Herbert · 2018-06-17 19:38:52 +09:00
  479eac8aa8
• Merge pull request #2617 from smoogipoo/timeline-audio-scrolling

  Couple the editor waveform timeline to the audio

  Dean Herbert · 2018-06-17 19:33:05 +09:00
  3c26556a23
• Merge branch 'master' into timeline-audio-scrolling
  Dean Herbert · 2018-06-17 19:01:21 +09:00
  a20ec0d4cc
• Make testcase work on appveyor (no BASS)
  smoogipoo · 2018-06-17 19:01:18 +09:00
  08f172ba98
• Merge branch 'master' into timeline-audio-scrolling
  Dean Herbert · 2018-06-17 19:01:16 +09:00
  e0ee5e2085
• Remove MusicController from compose timeline testcase
  smoogipoo · 2018-06-17 19:01:14 +09:00
  0695615c6a
• Use existing instance of beatmap rather than adding more resources
  smoogipoo · 2018-06-17 19:00:58 +09:00
  6c100caba7
• Use the passed-in ruleset
  smoogipoo · 2018-06-17 18:01:28 +09:00
  0a99d21938
• Privatise the proxied content
  smoogipoo · 2018-06-17 17:56:46 +09:00
  4575319102
• Merge remote-tracking branch 'origin/master' into fix-taiko-proxies
  smoogipoo · 2018-06-17 17:54:50 +09:00
  99ef44eca2
• Merge branch 'master' into mania-keymod-optimisation
  Dean Herbert · 2018-06-15 18:29:27 +09:00
  719056ca4a
• Merge pull request #2802 from smoogipoo/diffcalc-rework

  Rework difficulty calculators to better support mods and attributes

  Dean Herbert · 2018-06-15 18:22:43 +09:00
  2018.616.0 cdc88a6c48
• Merge branch 'master' into diffcalc-rework
  Dean Herbert · 2018-06-15 18:02:18 +09:00
  a6437c005c
• Merge pull request #2775 from smoogipoo/fix-taiko-hitexplosions

  Make sure taiko hitexplosions expire and get removed

  Dean Herbert · 2018-06-15 18:00:47 +09:00
  9374415307
• Merge branch 'master' into fix-taiko-hitexplosions
  Dean Herbert · 2018-06-15 17:52:53 +09:00
  30f7837b03
• Merge pull request #2812 from peppy/droplets-should-bounce

  Fix droplets not bouncing off catcher's plate immediately

  Dean Herbert · 2018-06-15 17:52:28 +09:00
  eac5db5dbc
• Merge branch 'master' into droplets-should-bounce
  Dan Balasescu · 2018-06-15 17:34:54 +09:00
  0ba80fad60
• Merge pull request #2810 from peppy/remove-migrate-exception

  Remove custom migration exception

  Dan Balasescu · 2018-06-15 17:34:46 +09:00
  d7353135de
• Merge branch 'master' into remove-migrate-exception
  Dan Balasescu · 2018-06-15 17:22:34 +09:00
  234ed04cdd
• Merge pull request #2813 from peppy/fix-music-controller-drag

  Fix music controller draggability

  Dan Balasescu · 2018-06-15 17:22:29 +09:00
  ee88444be5
• Merge branch 'master' into fix-music-controller-drag
  Dean Herbert · 2018-06-15 17:08:01 +09:00
  db9141a6cf