17439 Commits

This Branch

This Branch

All Branches

• Merge pull request #4497 from peppy/fix-editor-cursor

  Fix gameplay cursor showing in editor

  Dan Balasescu · 2019-03-22 13:14:07 +09:00
  4fa6afdb1f
• Merge branch 'master' into fix-editor-cursor
  Dan Balasescu · 2019-03-22 12:36:36 +09:00
  e40f77cbeb
• Merge pull request #4500 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-03-20 23:59:45 +09:00
  2019.321.0 6058f994e1
• Update framework
  Dean Herbert · 2019-03-20 22:50:50 +09:00
  c555019692
• Merge pull request #4466 from nyquillerium/visual-settings-container

  Move user blurring logic into UserDimContainer

  Dean Herbert · 2019-03-20 22:22:11 +09:00
  42cb80e068
• Merge branch 'master' into visual-settings-container
  Dean Herbert · 2019-03-20 20:48:30 +09:00
  67a65b80fc
• Do less import work in [SetUp] step
  Dean Herbert · 2019-03-20 20:47:25 +09:00
  6a7ab6a001
• Actually add the background
  Dean Herbert · 2019-03-20 20:18:08 +09:00
  298c98871d
• Define explicit method to add background

  Also cleans up some redundant/misplaced comments.

  Dean Herbert · 2019-03-20 20:16:45 +09:00
  ba89bfee0c
• Reword comment
  Dean Herbert · 2019-03-20 20:04:07 +09:00
  8865d53992
• Add comment regarding HandlePositionalInput
  David Zhao · 2019-03-20 19:59:54 +09:00
  2e9d823af4
• Remove handle positional input
  David Zhao · 2019-03-20 19:49:37 +09:00
  2ff7aa6c2e
• Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
  David Zhao · 2019-03-20 19:48:57 +09:00
  bc6e8ce7b4
• Make restart public rather than reimplementing
  Dean Herbert · 2019-03-20 19:45:04 +09:00
  01f795b046
• Put loadcomplete next to other protected overrides
  David Zhao · 2019-03-20 19:42:39 +09:00
  8543e8c36f
• Add proper comment
  Dean Herbert · 2019-03-20 19:41:20 +09:00
  cda5bc28c8
• Formatting and naming improvements
  Dean Herbert · 2019-03-20 19:39:03 +09:00
  18de9e51c5
• Query for input manager once
  David Zhao · 2019-03-20 19:35:40 +09:00
  9013afe412
• Fix gameplay cursor showing in editor
  Dean Herbert · 2019-03-20 19:26:24 +09:00
  7254b765b0
• Merge pull request #4496 from smoogipoo/reinstantiate-mods

  Fix mods being reused for difficulty calculation

  Dean Herbert · 2019-03-20 19:10:52 +09:00
  fe255c54d0
• Merge pull request #4495 from smoogipoo/fix-spinner-conversion

  Fix catch spinners not being allowed for conversion
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-03-20 19:10:31 +09:00
  2118d50bae
• Wait for dim
  David Zhao · 2019-03-20 17:31:06 +09:00
  b5e8eb2a4a
• Add test case for resuming PlayerLoader
  David Zhao · 2019-03-20 17:18:42 +09:00
  fbfef844de
• Use the previous conditional instead
  David Zhao · 2019-03-20 16:54:42 +09:00
  a5916f995e
• Move blurring logic into Update instead
  David Zhao · 2019-03-20 16:50:47 +09:00
  e9034c8a30
• Remove unnecessary allocations
  smoogipoo · 2019-03-20 16:46:16 +09:00
  c510385aa8
• Use fresh mods for each difficulty calculation iteration
  smoogipoo · 2019-03-20 16:37:25 +09:00
  6df275c83a
• Merge branch 'master' into fix-spinner-conversion
  Dean Herbert · 2019-03-20 16:32:44 +09:00
  13e2d6a340
• Merge pull request #4491 from peppy/ruleset-container-refactor

  Refactor RulesetContainer for readability

  Dan Balasescu · 2019-03-20 15:17:34 +09:00
  8d35b4fece
• Fix variable hiding
  David Zhao · 2019-03-20 15:13:59 +09:00
  1086688e0a
• Amend comment
  David Zhao · 2019-03-20 15:06:07 +09:00
  f670e4664d
• store a field
  David Zhao · 2019-03-20 14:58:32 +09:00
  2467ece020
• Merge branch 'master' into ruleset-container-refactor
  Dean Herbert · 2019-03-20 14:55:58 +09:00
  6f1610be79
• Override add instead
  David Zhao · 2019-03-20 14:55:52 +09:00
  86658e357b
• Reorder class
  Dean Herbert · 2019-03-20 14:55:38 +09:00
  c186629b8a
• Fix misses/typos
  Dean Herbert · 2019-03-20 14:49:33 +09:00
  5f288650bf
• Merge pull request #4485 from peppy/player-test-flexibility

  Increase flexibility of player test cases

  Dan Balasescu · 2019-03-20 14:39:46 +09:00
  268d3c6291
• Fix merge
  David Zhao · 2019-03-20 14:37:32 +09:00
  9964644683
• Merge branch 'master' into player-test-flexibility
  Dan Balasescu · 2019-03-20 14:31:33 +09:00
  aca99c2c42
• Merge remote-tracking branch 'upstream/master' into visual-settings-container
  David Zhao · 2019-03-20 14:29:20 +09:00
  2646126d86
• Rework instant blur logic such that updateVisuals doesn't need to be public
  David Zhao · 2019-03-20 14:17:35 +09:00
  15637f9c4a
• Fix catch spinners not being allowed for conversion
  smoogipoo · 2019-03-20 13:53:22 +09:00
  6511234804
• Merge pull request #4493 from smoogipoo/catch-hr-fixes

  Further fixes to catch HR application

  Dean Herbert · 2019-03-20 12:58:58 +09:00
  ddbc46b5a6
• Ensure RNG max value cannot go below min value
  smoogipoo · 2019-03-20 12:06:37 +09:00
  8f0440d14c
• Fix JuiceStreams not affecting lastPosition/lastStartTime
  smoogipoo · 2019-03-20 12:06:14 +09:00
  003e36862f
• Merge pull request #4455 from peppy/fix-background-loading

  Fix screen background performance

  Dan Balasescu · 2019-03-20 11:35:00 +09:00
  033f03d597
• Add safety type check to DrawableScrollingRuleset
  Dean Herbert · 2019-03-20 11:34:06 +09:00
  936c3e1ed9
• Better protect not-generic DrawableRuleset
  Dean Herbert · 2019-03-20 11:31:03 +09:00
  45b8bfcfd3
• Remove double-generic type
  Dean Herbert · 2019-03-20 11:29:16 +09:00
  7b6d882ce6
• Merge branch 'master' into fix-background-loading
  Dan Balasescu · 2019-03-20 11:25:23 +09:00
  e5db0c973e