11127 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into mania-difficulty
  Dean Herbert · 2018-03-12 14:07:14 +09:00
  8cbcdeb665
• Merge pull request #2191 from peppy/decoders

  Rework decoders to be more flexible

  Dean Herbert · 2018-03-12 14:04:24 +09:00
  1af6a1c377
• Merge branch 'master' into decoders
  Dean Herbert · 2018-03-12 13:38:22 +09:00
  ab4c527ebc
• Merge branch 'master' into mania-difficulty
  Dean Herbert · 2018-03-12 13:31:48 +09:00
  9f644571ea
• Merge pull request #2188 from tgi74/mania_mirror

  Add Mirror Mod for Mania

  Dean Herbert · 2018-03-12 13:19:48 +09:00
  147396f9ca
• Apply beatmap converter mods in PerformanceCalculator
  smoogipoo · 2018-03-12 13:09:19 +09:00
  3cd203699b
• Merge branch 'master' into mania_mirror
  Dean Herbert · 2018-03-12 13:08:01 +09:00
  f8eace352e
• Merge pull request #2197 from peppy/update-issue

  Update ISSUE_TEMPLATE

  Dean Herbert · 2018-03-12 13:07:25 +09:00
  67212f3abe
• Apply beatmap converter mods in DifficultyCalculator
  smoogipoo · 2018-03-12 13:06:42 +09:00
  81186f8423
• Minor cleanups
  smoogipoo · 2018-03-12 13:01:29 +09:00
  fbb80edde1
• Merge branch 'master' into update-issue
  Dean Herbert · 2018-03-12 12:57:03 +09:00
  78ed8448e6
• Merge pull request #2198 from peppy/fix-login-failure

  Fix login failure for users with no country rank

  Dean Herbert · 2018-03-12 12:56:28 +09:00
  c965f3af86
• Merge branch 'master' into update-issue
  Dan Balasescu · 2018-03-12 12:47:27 +09:00
  282301e563
• Merge branch 'master' into fix-login-failure
  Dean Herbert · 2018-03-12 12:41:45 +09:00
  1d0a44a0bb
• Merge pull request #2189 from peppy/smoother-parallax-scale

  Interpolate ParallaxContainer's scale

  Dean Herbert · 2018-03-12 12:41:12 +09:00
  268ff49652
• Merge branch 'master' into smoother-parallax-scale
  Dan Balasescu · 2018-03-12 12:12:01 +09:00
  fce61943bd
• Merge pull request #2185 from peppy/relative-date-drawable

  Add drawable to display (and update) relative dates

  Dan Balasescu · 2018-03-12 12:10:44 +09:00
  555e939933
• Reorder arithmetic operation
  smoogipoo · 2018-03-12 11:56:49 +09:00
  46caab6310
• Merge branch 'master' into mania_mirror
  Dan Balasescu · 2018-03-12 11:52:38 +09:00
  dc85067b8c
• Add back beatmap version set
  Dean Herbert · 2018-03-12 11:33:12 +09:00
  1bcda4930e
• Merge branch 'master' into relative-date-drawable
  Dan Balasescu · 2018-03-12 11:28:43 +09:00
  50acab8d86
• Merge pull request #2182 from peppy/fix-duplicate-judgements

  Remove judgements when deciding a new judgement for a HitObject

  Dan Balasescu · 2018-03-12 11:28:34 +09:00
  09b13ee618
• Merge branch 'master' into fix-duplicate-judgements
  Dan Balasescu · 2018-03-12 11:02:54 +09:00
  0da407f75c
• Merge pull request #2160 from peppy/rewrite-break-overlay

  Rewrite BreakOverlay to work with rewinding

  Dan Balasescu · 2018-03-12 11:02:40 +09:00
  89582f7afe
• Fix tooltip not working due to not handling input
  smoogipoo · 2018-03-12 10:49:50 +09:00
  86d93ffe3c
• Merge branch 'master' into relative-date-drawable
  Dan Balasescu · 2018-03-12 10:36:43 +09:00
  96e2aca1ba
• Fix duplicate item in csproj
  smoogipoo · 2018-03-12 10:35:37 +09:00
  209d91fe21
• Merge branch 'master' into fix-duplicate-judgements
  Dan Balasescu · 2018-03-12 10:29:50 +09:00
  8ba87dfdbd
• Fix post-merge errors
  smoogipoo · 2018-03-12 09:51:32 +09:00
  33c721bcbb
• Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
  smoogipoo · 2018-03-12 09:47:05 +09:00
  6e51b74890
• Merge pull request #2200 from HoLLy-HaCKeR/fix-legacyid-check

  Fix check against LegacyID for non-default rulesets

  Dean Herbert · 2018-03-12 09:06:53 +09:00
  7bf38eb1ad
• Only check by null instead of sign
  HoLLy · 2018-03-11 21:27:49 +01:00
  9c75c392f2
• Fix check against LegacyID for non-default rulesets
  HoLLy · 2018-03-11 20:19:03 +01:00
  a321bcf3af
• Merge pull request #2159 from naoey/fix-unplayable-beatmaps

  Make song select ensure current beatmap is always playable in the active ruleset

  Dean Herbert · 2018-03-11 01:38:11 +09:00
  3a5283f96d
• Use private instead of protected
  Dean Herbert · 2018-03-11 01:26:03 +09:00
  db2a663234
• Merge branch 'master' into fix-unplayable-beatmaps
  Dean Herbert · 2018-03-11 01:19:54 +09:00
  d1ab52e7bc
• Merge branch 'master' into decoders
  Dean Herbert · 2018-03-11 01:04:28 +09:00
  c346638459
• Fix login failure for users with no country rank

  Closes #2148.

  Dean Herbert · 2018-03-11 00:44:16 +09:00
  9233266fe1
• Update ISSUE_TEMPLATE
  Dean Herbert · 2018-03-10 20:01:36 +09:00
  709fcf9552
• Merge pull request #2194 from smoogipoo/drawableslider-cleanup

  Split out the slider head into a separate drawable hitobject

  Dean Herbert · 2018-03-10 18:50:55 +09:00
  a9327eac8f
• Merge remote-tracking branch 'upstream/master'
  tgi74000 · 2018-03-10 08:46:00 +01:00
  a29189ff84
• Renamed ManiaMirrorMod to ManiaModMirror
  tgi74000 · 2018-03-10 08:44:46 +01:00
  a4dfeff2d7
• Removed redundant parentheses
  tgi74000 · 2018-03-10 08:39:11 +01:00
  ed20e31bbe
• Merge branch 'master' into drawableslider-cleanup
  Dean Herbert · 2018-03-10 16:34:15 +09:00
  ac5a2f18c4
• Split out the slider head into a separate drawable hitobject
  smoogipoo · 2018-03-10 01:13:59 +09:00
  8ed5fce43a
• Merge pull request #2193 from peppy/update-framework-again

  Fix major regression (framework revert)

  Dean Herbert · 2018-03-10 01:08:17 +09:00
  5727965431
• Fix major regression (framework revert)
  Dean Herbert · 2018-03-10 00:48:48 +09:00
  7cabc54f64
• Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps
  naoey · 2018-03-09 19:40:00 +05:30
  56730247e3
• Invert bool, add test, and handle ruleset change.
  naoey · 2018-03-09 19:39:28 +05:30
  2c0488b1f1
• Merge branch 'master' into fix-unplayable-beatmaps
  Dean Herbert · 2018-03-09 21:39:48 +09:00
  9ad9fc5aa9