19539 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into Private_Messages
  miterosan · 2018-06-30 16:17:56 +02:00
  621f4218a3
• Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode
  Roman Kapustin · 2018-06-30 17:05:25 +03:00
  101f18821a
• Don't handle all actions
  Dean Herbert · 2018-06-29 23:35:14 +09:00
  754e072e01
• Only clear text in FocusedTextBox
  Dean Herbert · 2018-06-29 23:28:15 +09:00
  fb90a4924b
• Replace todo
  Dean Herbert · 2018-06-29 23:16:05 +09:00
  7c0547b4ee
• Merge branch 'master' into allow-back-in-player
  Dean Herbert · 2018-06-29 21:54:18 +09:00
  b9b1e77172
• Merge pull request #2884 from peppy/di-backed-ruleset

  Use dependency injection to access the current ruleset

  Dean Herbert · 2018-06-29 21:35:34 +09:00
  2018.629.0 109649aa52
• Fix protection change
  Dean Herbert · 2018-06-29 21:25:51 +09:00
  ad28f88498
• Update framework
  Dean Herbert · 2018-06-29 21:06:43 +09:00
  cd47bd2cf8
• Tidy up escape handling
  Dean Herbert · 2018-06-29 21:06:38 +09:00
  6a80a21078
• Fix ruleset not getting updated if changed
  smoogipoo · 2018-06-29 20:50:39 +09:00
  6d6436c8d3
• SongSelect needs to recache as IBindable
  smoogipoo · 2018-06-29 20:50:30 +09:00
  9187eb8626
• Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
  Dean Herbert · 2018-06-29 20:30:42 +09:00
  8cf1553fd5
• Use IBindable where possible
  Dean Herbert · 2018-06-29 20:28:28 +09:00
  06bd3d4815
• Change logic
  Dean Herbert · 2018-06-29 20:16:24 +09:00
  0e649b8866
• Update exception type
  Dean Herbert · 2018-06-29 20:13:29 +09:00
  34fef3caba
• Merge branch 'master' into di-backed-ruleset
  Dean Herbert · 2018-06-29 19:33:12 +09:00
  9fce4eaccf
• Ensure toolbar triggers updates to SongSelect's ruleset
  Dean Herbert · 2018-06-29 19:32:42 +09:00
  1c32951d4b
• Cache also as IBindable
  Dean Herbert · 2018-06-29 19:25:28 +09:00
  182ac80881
• Trim lines
  Dean Herbert · 2018-06-29 19:25:20 +09:00
  6d6fcc953b
• Merge pull request #2849 from peppy/fix-dialog-overlay-sounds

  Fix dialog overlay playing double samples on show/hide

  Dan Balasescu · 2018-06-29 18:59:46 +09:00
  9bf906df80
• Merge branch 'master' into fix-dialog-overlay-sounds
  Dan Balasescu · 2018-06-29 18:45:37 +09:00
  513129d4a8
• Merge pull request #2899 from peppy/fix-negative-online-set-id

  Fix beatmaps importing with -1 as online set ID

  Dan Balasescu · 2018-06-29 18:45:29 +09:00
  bacf91938c
• Re-privatise
  smoogipoo · 2018-06-29 18:33:28 +09:00
  1e696d247e
• Merge branch 'master' into fix-negative-online-set-id
  Dan Balasescu · 2018-06-29 18:29:36 +09:00
  8abcf68188
• Fix incorrect migration conditional
  Dean Herbert · 2018-06-29 18:23:53 +09:00
  4212a9d0d7
• Merge pull request #2915 from peppy/fix-delta-patching

  Revert SharpCompress library to fix delta patching regression

  Dan Balasescu · 2018-06-29 18:19:02 +09:00
  34ddb79a96
• Merge branch 'master' into fix-delta-patching
  Dan Balasescu · 2018-06-29 18:01:56 +09:00
  f149289c83
• Merge pull request #2778 from cl8n/catch-scoring

  Add judgements to osu!catch

  Dean Herbert · 2018-06-29 17:50:39 +09:00
  d6fae1e4b9
• Merge branch 'master' into hit-shake
  Dan Balasescu · 2018-06-29 17:38:02 +09:00
  f35ea18755
• Move shake duration to a constant
  tgi74000 · 2018-06-29 10:36:00 +02:00
  3d50050089
• Make method protected
  Dan Balasescu · 2018-06-29 17:31:13 +09:00
  e3317b5145
• Merge branch 'master' into catch-scoring
  Dean Herbert · 2018-06-29 17:29:15 +09:00
  23aa2a2361
• Merge pull request #2914 from tgi74/beatmap-defaults

  Add BeatmapInfo's stable defaults to fix compatibility with old beatmaps

  Dan Balasescu · 2018-06-29 17:23:47 +09:00
  558969b2c5
• Adjust xmldoc
  Dean Herbert · 2018-06-29 17:21:55 +09:00
  e12ce3c2a8
• Merge branch 'master' into catch-scoring
  Dean Herbert · 2018-06-29 17:16:14 +09:00
  098aeabc9e
• Merge branch 'master' into beatmap-defaults
  Dan Balasescu · 2018-06-29 17:14:40 +09:00
  845d1400dc
• Merge pull request #2913 from peppy/fix-combo-index

  Fix combo index being wrong

  Dan Balasescu · 2018-06-29 17:12:44 +09:00
  b6caccbe44
• Change default IsBonus definition and remove unnecessary overrides
  Dean Herbert · 2018-06-29 17:07:08 +09:00
  c0b65a6a73
• Remove unused field
  Dean Herbert · 2018-06-29 17:00:41 +09:00
  cacabeb67e
• Fix catch test failing due to disabled bindable
  Dean Herbert · 2018-06-29 16:49:11 +09:00
  750f5a86c3
• Make bananas explode even on miss
  Dean Herbert · 2018-06-29 16:49:01 +09:00
  f1a35f77d2
• Centralise judgement logic
  Dean Herbert · 2018-06-29 15:27:02 +09:00
  f7fbf61306
• Use better casting
  Dean Herbert · 2018-06-29 15:01:33 +09:00
  3b262e0d16
• Merge branch 'master' into catch-scoring
  Dean Herbert · 2018-06-29 14:59:15 +09:00
  0940715631
• Move hyperdash init to PostProcess
  smoogipoo · 2018-06-29 13:52:13 +09:00
  4fb276bab7
• Split out into separate interface + add xmldocs
  smoogipoo · 2018-06-29 13:24:33 +09:00
  99068debc4
• Add a preprocess method to BeatmapProcessor
  smoogipoo · 2018-06-29 12:45:48 +09:00
  756cabd5d0
• Remove unused/duplicate interface
  Dean Herbert · 2018-06-29 12:20:53 +09:00
  70a119dde7
• Revert SharpCompress library to fix delta patching regression
  Dean Herbert · 2018-06-29 11:34:52 +09:00
  8742f41b7d