24822 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-hold-note-input
  Dean Herbert · 2019-12-26 23:50:53 +09:00
  32843ffef5
• Fix early-escape not continuing to results screen (#7362)

  Fix early-escape not continuing to results screen

  Dean Herbert · 2019-12-26 23:50:21 +09:00
  033bb15500
• Separate health and score processing components (#7358)

  Separate health and score processing components

  Dean Herbert · 2019-12-26 23:48:55 +09:00
  3d5561b02e
• Fix nub position getting offset by size changes (#7359)

  Fix nub position getting offset by size changes

  Dean Herbert · 2019-12-26 19:18:52 +09:00
  8d79934d39
• Fix tests
  smoogipoo · 2019-12-26 19:18:39 +09:00
  00a36c388c
• Use cleaner solution via cancellation of older schedule
  Dean Herbert · 2019-12-26 19:05:32 +09:00
  a041f32072
• Merge pull request #7360 from huoyaoyuan/mod-typo

  Fix name typo of OsuModObjectScaleTween

  Dan Balasescu · 2019-12-26 18:29:10 +09:00
  f005784070
• Fix escape not continuing to results screen
  smoogipoo · 2019-12-26 18:27:48 +09:00
  8903f286ef
• Remove whitespace
  smoogipoo · 2019-12-26 17:57:16 +09:00
  d45556eb6a
• Fix name typo of OsuModObjectScaleTween
  Huo Yaoyuan · 2019-12-26 14:25:41 +08:00
  9a013acb26
• Fix nub position getting offset by size changes
  smoogipoo · 2019-12-26 15:14:19 +09:00
  96a4f9ae53
• Merge remote-tracking branch 'huoyaoyuan/master' into health-processor

  # Conflicts:
  #	osu.Game.Rulesets.Catch/CatchRuleset.cs
  #	osu.Game.Rulesets.Mania/ManiaRuleset.cs
  #	osu.Game.Rulesets.Taiko/TaikoRuleset.cs

  smoogipoo · 2019-12-26 14:56:54 +09:00
  7414a6aadd
• Merge pull request #7347 from peppy/fix-sample-lookup

  Fix sample lookup not working correctly for custom rulesets

  Dan Balasescu · 2019-12-26 12:40:55 +09:00
  5a11fe9a84
• Fix sample lookup not working correctly for custom rulesets
  Dean Herbert · 2019-12-26 00:51:44 +09:00
  a47e5aeead
• Merge pull request #7338 from peppy/remove-legacy-id

  Fix missing ruleset IDs in non-legacy rulesets

  Dan Balasescu · 2019-12-25 21:41:46 +09:00
  2019.1225.0 19ce3eba28
• Merge branch 'master' into remove-legacy-id
  Dean Herbert · 2019-12-25 21:25:33 +09:00
  9b0af901ef
• Allow ctrl-tabbing on more tab controls (#7319)

  Allow ctrl-tabbing on more tab controls

  Dean Herbert · 2019-12-25 21:09:27 +09:00
  3862bbfa25
• Merge branch 'master' into remove-legacy-id
  Dan Balasescu · 2019-12-25 21:01:12 +09:00
  9702cc9809
• Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls
  Dean Herbert · 2019-12-25 20:49:45 +09:00
  41d99df73c
• Make the Easy mod's extra life count customizable (#7331)

  Make the Easy mod's extra life count customizable

  Dean Herbert · 2019-12-25 20:19:08 +09:00
  1b1c255394
• Simplify/improve beatmap conversion precheck (#7328)

  Simplify/improve beatmap conversion precheck

  Dean Herbert · 2019-12-25 20:08:47 +09:00
  0e1eca6c0b
• Merge branch 'master' into better-beatmap-conversion
  Dean Herbert · 2019-12-25 19:52:06 +09:00
  504a55e803
• Update framework (#7342)

  Update framework

  Dean Herbert · 2019-12-25 19:51:49 +09:00
  871f594061
• Merge branch 'master' into update-framework
  Dean Herbert · 2019-12-25 19:32:17 +09:00
  4e419cabdc
• Merge pull request #7303 from peppy/settings-source-value-changed

  Update song select statistics when mod changes settings

  Dan Balasescu · 2019-12-25 19:16:42 +09:00
  c63963fbd9
• Update framework
  Dean Herbert · 2019-12-25 18:51:44 +09:00
  81c330ec26
• Merge branch 'master' into settings-source-value-changed
  Dan Balasescu · 2019-12-25 18:03:36 +09:00
  38219255c7
• Merge pull request #7157 from LeNitrous/adjustable-map-settings

  Add difficulty adjustment mod

  Dean Herbert · 2019-12-25 17:37:37 +09:00
  6d89fe97e9
• Merge branch 'master' into settings-source-value-changed
  Dan Balasescu · 2019-12-25 17:23:08 +09:00
  a265a0c7c5
• Merge remote-tracking branch 'upstream/master' into adjustable-map-settings
  Dean Herbert · 2019-12-25 15:20:17 +09:00
  d84b319a3a
• Fix code inspections
  Dean Herbert · 2019-12-25 15:20:10 +09:00
  911dc2d98d
• Rename method to be more appropriate

  Also adds xmldoc.

  Dean Herbert · 2019-12-25 15:20:04 +09:00
  52ba0cd816
• Fallback to current skin combo colours if none provided on beat… (#6449)

  Fallback to current skin combo colours if none provided on beatmap skin
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-12-25 15:19:24 +09:00
  1455b9e796
• Rename tests and add missing coverage
  Dean Herbert · 2019-12-25 15:05:08 +09:00
  3485ef33a7
• Simplify tests
  Dean Herbert · 2019-12-25 15:01:05 +09:00
  9090d13e05
• Remove redundant logic
  Dean Herbert · 2019-12-25 14:55:22 +09:00
  783159f7a0
• Make test easier to visually examine
  Dean Herbert · 2019-12-25 14:55:13 +09:00
  04cbdd9c6c
• Remove redundant setter
  Dean Herbert · 2019-12-25 14:55:05 +09:00
  145ac8e0b5
• Merge branch 'master' into fallback-to-skin-combo-colours
  Dean Herbert · 2019-12-25 14:38:09 +09:00
  f84d98223f
• Merge branch 'master' into adjustable-map-settings
  Dean Herbert · 2019-12-25 13:16:47 +09:00
  e019ea408a
• Fix incorrect dialog button animating on requesting quit twice (#7325)

  Fix incorrect dialog button animating on requesting quit twice

  Dean Herbert · 2019-12-25 13:15:30 +09:00
  89886ceb79
• Truncate rich presence status strings to 128 bytes (#7318)

  Truncate rich presence status strings to 128 bytes
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-12-25 12:28:44 +09:00
  a5e30859a9
• Apply suggested optimisations
  smoogipoo · 2019-12-25 12:04:28 +09:00
  1a7937bcf7
• Make ellipsis length into a static
  smoogipoo · 2019-12-25 11:14:40 +09:00
  36dd0e6998
• Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls
  Joseph Madamba · 2019-12-24 08:29:56 -08:00
  2a5f661408
• Make OsuTextBox use BasicTextBox (#7337)

  Make OsuTextBox use BasicTextBox
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-12-24 18:50:10 +09:00
  babaa4d5de
• Fix caret width having changed
  Dean Herbert · 2019-12-24 18:23:09 +09:00
  bc75bd34f6
• Make the easy mod's extra life count customizable
  Lucas A · 2019-12-24 10:13:12 +01:00
  e3753ae29f
• Update framework
  Dean Herbert · 2019-12-24 17:12:12 +09:00
  e088a85662
• Remove unused method
  smoogipoo · 2019-12-24 16:52:49 +09:00
  00546787c8