10158 Commits

This Branch

This Branch

All Branches

• fix storyboard path
  james58899 · 2018-01-23 18:18:54 +08:00
  fa800f0977
• Merge pull request #1957 from smoogipoo/fix-repeat-confusion

  Clean up off-by-one offsets from repeat-related properties

  Dean Herbert · 2018-01-23 16:14:59 +09:00
  098cfa7107
• Merge branch 'master' into fix-repeat-confusion
  Dean Herbert · 2018-01-23 16:06:07 +09:00
  384dc162b3
• Merge pull request #1956 from peppy/allow-quick-retry-key

  Allow user choice of the quick retry hotkey

  Dean Herbert · 2018-01-23 15:58:48 +09:00
  68161fa543
• Merge branch 'master' into fix-repeat-confusion
  Dean Herbert · 2018-01-23 15:22:37 +09:00
  52805cd82b
• Merge branch 'master' into allow-quick-retry-key
  Dan Balasescu · 2018-01-23 14:59:15 +09:00
  fcea12f83d
• Merge pull request #1945 from smoogipoo/bdl-cache-changes

  Update usage of DI in-line with framework changes

  Dean Herbert · 2018-01-23 14:31:05 +09:00
  0edcf1690b
• Update framework
  Dean Herbert · 2018-01-23 14:10:51 +09:00
  2a9b773b49
• Merge branch 'master' into bdl-cache-changes
  Dean Herbert · 2018-01-23 14:10:35 +09:00
  b793c2ec93
• Fix off-by-ones in RepeatPoint code
  smoogipoo · 2018-01-23 13:58:43 +09:00
  33c52ba30f
• Clean up off-by-one offsets from repeat-related properties
  smoogipoo · 2018-01-23 13:37:25 +09:00
  d37844c068
• Remove usings
  Dean Herbert · 2018-01-23 13:24:04 +09:00
  fa1f4304f6
• Allow user choice of the quick retry hotkey
  Dean Herbert · 2018-01-23 13:05:07 +09:00
  f823650b10
• Merge pull request #1908 from andy840119/mania_stage_fix

  Split the playfield columns and change the key number by mod

  Dean Herbert · 2018-01-23 11:03:56 +09:00
  4f360eac56
• Merge branch 'master' into mania_stage_fix
  Dean Herbert · 2018-01-23 10:55:33 +09:00
  b799dac5ac
• Back to max 10 special keys for now, change xmldoc to normal comment
  Dan Balasescu · 2018-01-23 10:51:01 +09:00
  9b471dea33
• Improve xmldoc + remove explicit Special2 value

  Special2 value is implicit at Special1 + 1 (2).

  Dan Balasescu · 2018-01-23 10:03:34 +09:00
  2bc67629b8
• Merge pull request #1955 from fangerm/license-year

  Update license year

  Dan Balasescu · 2018-01-23 09:36:58 +09:00
  8f4d62ec25
• Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?)
  Felix Ang · 2018-01-22 18:42:03 +01:00
  d294fcfb0b
• Update license year.
  Felix Ang · 2018-01-22 18:22:38 +01:00
  423559ec6c
• Merge pull request #1952 from peppy/catch-autoplay-advanced

  Add more human-like catch autoplay support

  Dan Balasescu · 2018-01-22 19:39:45 +09:00
  f5def7bb0a
• Merge branch 'master' into mania_stage_fix
  Dean Herbert · 2018-01-22 19:06:00 +09:00
  76eac9057d
• Add more human-like catch autoplay support

  Closes #1611

  Dean Herbert · 2018-01-22 18:46:59 +09:00
  32b540268e
• Merge pull request #1939 from Aergwyn/direct-show-deleted-sets

  Allow re-downloading of beatmaps pending deletion in osu!direct

  Dean Herbert · 2018-01-22 17:16:23 +09:00
  58b5e2c01b
• Merge branch 'master' into direct-show-deleted-sets
  Dean Herbert · 2018-01-22 17:08:10 +09:00
  95f941163b
• Merge pull request #1948 from peppy/fix-user-download-cancel

  Don't show error messages when a download is user-cancelled

  Dean Herbert · 2018-01-22 17:07:32 +09:00
  30987f2f71
• Merge branch 'master' into direct-show-deleted-sets
  Dan Balasescu · 2018-01-22 16:54:32 +09:00
  73799832ef
• Merge branch 'master' into fix-user-download-cancel
  Dean Herbert · 2018-01-22 16:27:26 +09:00
  a931d6e381
• Merge pull request #1947 from peppy/fix-downloads-during-import

  Keep downloads active until their associated import operation finishes

  Dean Herbert · 2018-01-22 16:27:17 +09:00
  3c9bf4df29
• Remove SpecialColumnPosition for now

  This needs to be re-implemented in the future, perhaps in a way that allows it to be dynamically changed.

  smoogipoo · 2018-01-22 16:19:05 +09:00
  68a6323168
• SpecialColumn -> SpecialColumnPosition
  smoogipoo · 2018-01-22 16:12:45 +09:00
  8a8b3f25e7
• Oops, forgot to commit OnJudgement change
  smoogipoo · 2018-01-22 16:12:35 +09:00
  351be4308f
• Fix stage background being too transparent

  This is the original colour for the background. Not sure why this was changed.

  smoogipoo · 2018-01-22 16:12:15 +09:00
  90d8ee8d36
• Update xmldoc to be more descriptive of single/dual stages
  smoogipoo · 2018-01-22 16:11:26 +09:00
  3d36fd3676
• Fix hitexplosions not working in the testcase
  smoogipoo · 2018-01-22 16:11:06 +09:00
  0ef6384de0
• we need to go back

  reverted change and instead check `DeletePending` when retrieving existing online IDs

  Aergwyn · 2018-01-22 08:04:14 +01:00
  82c8822888
• Disallow DualStages for non-converted beatmaps
  smoogipoo · 2018-01-22 15:52:54 +09:00
  c1331cef1b
• Fix showing too many keybindings
  smoogipoo · 2018-01-22 15:47:31 +09:00
  ba58b25f01
• Merge branch 'master' into fix-downloads-during-import
  Dean Herbert · 2018-01-22 15:43:39 +09:00
  56c001fd29
• Merge pull request #1946 from peppy/better-direct-progress-bar

  Continue showing progress bar on direct panels when importing

  Dean Herbert · 2018-01-22 15:43:24 +09:00
  85d1e81a92
• DualStages always doubles the column count in lazer
  smoogipoo · 2018-01-22 15:18:39 +09:00
  1350b68f15
• getVariantType -> getPlayfieldType
  smoogipoo · 2018-01-22 15:18:11 +09:00
  eede8333ba
• Dual stages is not ranked ಠ_ಠ
  smoogipoo · 2018-01-22 15:11:45 +09:00
  17d75b349d
• KeyCoop -> DualStages
  smoogipoo · 2018-01-22 15:11:15 +09:00
  77c4da5f0f
• IKeyBindingMod -> IPlayfieldTypeMod
  smoogipoo · 2018-01-22 15:07:14 +09:00
  583aa9922f
• Merge branch 'master' into better-direct-progress-bar
  Dan Balasescu · 2018-01-22 15:03:34 +09:00
  d81fb9ef0d
• Merge pull request #1949 from smoogipoo/disable-waveform-testcase

  Disable TestCaseWaveform

  Dean Herbert · 2018-01-22 15:03:23 +09:00
  723f31815a
• Privatise VariantMappingGenerator to ManiaRuleset
  smoogipoo · 2018-01-22 15:03:05 +09:00
  65a2e09593
• ManiaKeyBindingVariantType -> PlayfieldType
  smoogipoo · 2018-01-22 14:59:17 +09:00
  2674859b54
• Solo -> Single, Coop -> Dual
  smoogipoo · 2018-01-22 14:57:25 +09:00
  286b1bb81f