18246 Commits

This Branch

This Branch

All Branches

• Fix pauses being triggered in unexpected scenarios (#4750)

  Fix pauses being triggered in unexpected scenarios
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 16:07:37 +09:00
  df4e08dd9b
• Merge branch 'master' into fix-more-pause-cases
  Dean Herbert · 2019-05-12 15:57:45 +09:00
  3566da73cc
• Close beatmap options when suspending (#4761)

  Close beatmap options when suspending

  Dean Herbert · 2019-05-12 15:50:10 +09:00
  9add2562f9
• Fix beatmap carousel overlapping beatmap info wedge (#4760)

  Fix beatmap carousel overlapping beatmap info wedge
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 15:49:50 +09:00
  71d3c9c495
• Use more correct calculation
  Dean Herbert · 2019-05-12 15:40:58 +09:00
  790700d8bf
• Merge remote-tracking branch 'upstream/master' into fix-carousel-sizing
  Dean Herbert · 2019-05-12 15:39:55 +09:00
  9925aafa98
• Close beatmap options when suspending
  Joehu · 2019-05-11 21:26:42 -07:00
  175daac16a
• Fix player loader testcase potentially failing (#4720)

  Fix player loader testcase potentially failing
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-12 13:18:38 +09:00
  f5d7330a20
• Fix beatmap carousel overlapping beatmap info wedge
  Joehu · 2019-05-11 20:08:45 -07:00
  29cec54b3c
• Merge remote-tracking branch 'origin/master' into fix-more-pause-cases

  # Conflicts:
  #	osu.Game.Tests/Visual/Gameplay/TestCasePause.cs

  smoogipoo · 2019-05-10 22:16:59 +09:00
  bde2d552b6
• Remove unused variable
  smoogipoo · 2019-05-10 22:15:33 +09:00
  01eb1a34a9
• Allow song progress bar to show current position during a seek (#4746)

  Allow song progress bar to show current position during a seek
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-05-10 21:10:11 +09:00
  2019.510.0 ad93eda399
• Merge pull request #4743 from peppy/fix-score-deletion

  Fix score deletion not considering ScoreManager ownership

  Dan Balasescu · 2019-05-10 19:25:42 +09:00
  c157f3e817
• Merge branch 'master' into fix-score-deletion
  Dan Balasescu · 2019-05-10 19:09:18 +09:00
  4abd5c78cd
• Merge pull request #4753 from peppy/fix-failing-pause-tests

  Attempt to fix failing tests by delaying starting of the gameplay clock

  Dan Balasescu · 2019-05-10 19:08:42 +09:00
  101889cff9
• Trim whitespace
  smoogipoo · 2019-05-10 18:48:39 +09:00
  3fe61c4a7e
• Merge branch 'master' into progress-bar-show-seek
  Dan Balasescu · 2019-05-10 18:24:15 +09:00
  425154c264
• Merge branch 'master' into fix-score-deletion
  Dan Balasescu · 2019-05-10 18:24:04 +09:00
  fe7ea1e900
• Merge branch 'master' into fix-failing-pause-tests
  Dean Herbert · 2019-05-10 18:22:20 +09:00
  af3a75307d
• Merge pull request #4752 from smoogipoo/fix-cancellation-usages

  Use nullable cancellation tokens

  Dan Balasescu · 2019-05-10 18:21:53 +09:00
  378f8103fb
• Fix testcase regression
  smoogipoo · 2019-05-10 18:21:07 +09:00
  3352252e00
• Attempt to fix failing tests by delaying starting of the gameplay clock
  Dean Herbert · 2019-05-10 18:10:07 +09:00
  97796a8578
• Fix incorrect value being clamped
  smoogipoo · 2019-05-10 18:04:58 +09:00
  d2479acbf2
• Merge branch 'master' into fix-score-deletion
  Dan Balasescu · 2019-05-10 18:00:43 +09:00
  4776fc75b9
• Use nullable cancellation tokens
  smoogipoo · 2019-05-10 17:42:45 +09:00
  ad4b4f3422
• Merge branch 'master' into progress-bar-show-seek
  Dean Herbert · 2019-05-10 17:27:49 +09:00
  a44296a6db
• Clamp values
  Dean Herbert · 2019-05-10 17:18:39 +09:00
  fdf67aaa11
• Add cancellation support to storyboard/hitobject loading (#4751)

  Add cancellation support to storyboard/hitobject loading

  Dean Herbert · 2019-05-10 17:15:38 +09:00
  3860282ace
• Merge branch 'master' into player-load-cancellations
  Dean Herbert · 2019-05-10 17:15:27 +09:00
  150b74dc2b
• Merge branch 'master' into player-load-cancellations
  Dean Herbert · 2019-05-10 16:58:36 +09:00
  21ab628f41
• Remove unnecessary Storyboard disposal
  smoogipoo · 2019-05-10 16:31:22 +09:00
  f6dfcc4dcf
• Add cancellation to storyboard/hitobject loading
  smoogipoo · 2019-05-10 16:31:09 +09:00
  d25d39b315
• Merge pull request #4745 from peppy/fix-long-skip-performance

  Fix long skip performance

  Dan Balasescu · 2019-05-10 16:27:11 +09:00
  03c949c396
• Merge branch 'master' into fix-long-skip-performance
  Dan Balasescu · 2019-05-10 16:10:50 +09:00
  32808a8a59
• Fix pause triggered when already paused
  smoogipoo · 2019-05-10 15:51:12 +09:00
  6a957ad27f
• Fix testcase players pausing on window unfocus
  smoogipoo · 2019-05-10 15:39:25 +09:00
  7c105fd99f
• Merge branch 'master' into fix-player-testcase
  Dean Herbert · 2019-05-10 13:20:22 +09:00
  3c796bcfda
• Merge pull request #4744 from nyquillerium/result-count

  Fix incorrect judgement counts for rewinding

  Dan Balasescu · 2019-05-10 12:31:16 +09:00
  5fa721fdab
• Merge remote-tracking branch 'upstream/master' into result-count
  David Zhao · 2019-05-10 11:20:16 +09:00
  9480c74fcc
• Revert mirroring condition too
  David Zhao · 2019-05-09 18:59:00 +09:00
  5c096cbc91
• Split out affectscombo change
  David Zhao · 2019-05-09 18:56:19 +09:00
  9e0af723cc
• Use FrameStabilityClock to denote current position on song progress
  Dean Herbert · 2019-05-09 18:09:26 +09:00
  9248e6290c
• Add a tween when clicking to seek
  Dean Herbert · 2019-05-09 18:07:38 +09:00
  5942072128
• Allow custom MaxCatchUpFrames to be specified

  Also adjusts the default to allow for smoother seeking.

  Dean Herbert · 2019-05-09 16:39:03 +09:00
  3bcfc86b9c
• Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start
  Dean Herbert · 2019-05-09 16:39:03 +09:00
  66594b7a1b
• Subtract a result from count if its been reverted
  David Zhao · 2019-05-09 16:16:20 +09:00
  b0e34d86d5
• Only combo-incrementing results add to result count
  David Zhao · 2019-05-09 15:31:37 +09:00
  39fb5712f1
• Merge branch 'master' into fix-score-deletion
  Dean Herbert · 2019-05-09 15:21:05 +09:00
  516186c945
• Add proper co-dependent beatmap/score deletion via events
  Dean Herbert · 2019-05-09 15:15:28 +09:00
  24e64c1333
• Allow Delete and Undelete operations to run silently when needed
  Dean Herbert · 2019-05-09 15:15:02 +09:00
  6ebd13c733