12863 Commits

This Branch

This Branch

All Branches

• 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
• Merge pull request #2792 from peppy/fix-volume-pixellation

  Fix pixellation of volume meter progress bars

  Dan Balasescu · 2018-06-15 17:07:50 +09:00
  87d69b93a6
• Merge branch 'master' into fix-music-controller-drag
  Dan Balasescu · 2018-06-15 17:07:25 +09:00
  40daa87f22
• Remove easily-confused comment
  Dan Balasescu · 2018-06-15 17:07:07 +09:00
  aaf3ef240e
• Merge branch 'master' into fix-volume-pixellation
  Dean Herbert · 2018-06-15 16:45:15 +09:00
  8b5a9c3236
• Merge pull request #2807 from smoogipoo/mania-conversion-fixes

  Fix a few osu!mania beatmap conversion edge cases

  Dean Herbert · 2018-06-15 16:45:10 +09:00
  e8fcc01ca4
• Merge branch 'master' into mania-conversion-fixes
  Dean Herbert · 2018-06-15 16:33:46 +09:00
  f7b2da852f
• Fix incorrect comment
  Dean Herbert · 2018-06-15 16:12:18 +09:00
  a2950b1d80
• Fix music controller drag activating from anywhere on the screen
  Dean Herbert · 2018-06-15 16:12:11 +09:00
  1c27ef644a
• Fix droplets not bouncing off catcher's plate immediately
  Dean Herbert · 2018-06-15 15:44:47 +09:00
  149d94116b
• Merge pull request #2806 from smoogipoo/conversion-test-improvements

  Extend the testability of beatmap conversions

  Dean Herbert · 2018-06-15 14:33:46 +09:00
  3fcaf52378
• Merge branch 'master' into conversion-test-improvements
  Dean Herbert · 2018-06-15 14:26:37 +09:00
  036c57833b
• Merge pull request #2811 from Joehuu/remove-from-prefix

  Remove "from" prefix from sources on direct panels

  Dean Herbert · 2018-06-15 14:26:30 +09:00
  2819a283f7
• Merge branch 'master' into remove-from-prefix
  Dean Herbert · 2018-06-15 14:19:36 +09:00
  e2a4d6c15f
• Remove "from" prefix from sources on direct panels
  Joehu · 2018-06-14 21:53:01 -07:00
  069d939e29
• Merge branch 'master' into fix-volume-pixellation
  Dan Balasescu · 2018-06-15 13:44:18 +09:00
  98cafa106f
• Merge pull request #2801 from peppy/fix-juice-explosions

  Fix combos ending with JuiceStreams never leaving the catcher's plate

  Dan Balasescu · 2018-06-15 13:43:03 +09:00
  dea5143028
• Remove custom migration exception

  This was hiding the true error message from ever hitting logs.
  Made to help disagnose #2711.

  Dean Herbert · 2018-06-15 13:38:42 +09:00
  4a19f22b3d
• Add one more newline
  smoogipoo · 2018-06-14 21:29:08 +09:00
  a4d2364083
• Allow convertmapping to be extended
  smoogipoo · 2018-06-14 21:25:33 +09:00
  b99b520656
• Always generate mappings/convert values as soon as objects are converted

  # Conflicts:
  #	osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs

  smoogipoo · 2018-06-14 21:25:23 +09:00
  024d2abfe0
• Some rulesets don't have a beatmap processor
  smoogipoo · 2018-06-14 21:23:11 +09:00
  8d0e7abdd6
• Process beatmap before generating mappings
  smoogipoo · 2018-06-14 21:22:56 +09:00
  5e66b02108
• Fix non-inverted calculation
  smoogipoo · 2018-06-14 19:38:48 +09:00
  fd84afb89b
• Fix missing convert type
  smoogipoo · 2018-06-14 19:37:32 +09:00
  a3bf16e481