17589 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into wedge-fix
  Dean Herbert · 2019-03-29 12:23:42 +09:00
  d6f8dbfd5c
• Merge pull request #4156 from Aergwyn/correct-preview-loop

  Correctly loop from preview point in song select
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-03-29 12:16:48 +09:00
  8d770404c0
• Merge branch 'master' into correct-preview-loop
  Dean Herbert · 2019-03-29 12:00:58 +09:00
  26a73b4a65
• Merge pull request #4533 from peppy/universal-playfield-adjust

  Move all playfield adjustments to universal PlayfieldAdjustmentContainer

  Dan Balasescu · 2019-03-29 12:00:16 +09:00
  8e7e02b824
• Merge branch 'master' into universal-playfield-adjust
  Dean Herbert · 2019-03-29 11:51:44 +09:00
  ed0bf59e73
• Merge pull request #4536 from peppy/key-counter-display

  Rename KeyCounterCollection -> KeyCounterDisplay

  Dan Balasescu · 2019-03-29 11:49:44 +09:00
  aaeb598649
• Fix incorrect type specification
  Dean Herbert · 2019-03-29 11:38:45 +09:00
  1e369628a5
• Remove redundant cast

  Co-Authored-By: peppy <pe@ppy.sh>

  Dan Balasescu · 2019-03-29 11:36:40 +09:00
  bab7d78130
• Merge branch 'master' into universal-playfield-adjust
  Dean Herbert · 2019-03-29 11:25:54 +09:00
  785433bb74
• Merge branch 'master' into key-counter-display
  Dan Balasescu · 2019-03-29 11:22:59 +09:00
  d410054ec8
• Merge pull request #4544 from peppy/sprite-icon-compatibility

  Update icon usage to match framework changes

  Dan Balasescu · 2019-03-29 11:22:47 +09:00
  97dad5804a
• Merge branch 'master' into sprite-icon-compatibility
  Dean Herbert · 2019-03-29 11:15:34 +09:00
  7715606188
• Merge pull request #4535 from peppy/gameplay-cursor-last-state

  Add base gameplay cursor class to retrieve true visibility state

  Dan Balasescu · 2019-03-29 11:15:21 +09:00
  724675dd49
• Merge branch 'master' into gameplay-cursor-last-state
  Dan Balasescu · 2019-03-29 11:01:13 +09:00
  772f0cac8a
• Merge pull request #4534 from peppy/gameplay-paused-no-update

  Don't update gameplay loop while paused

  Dan Balasescu · 2019-03-29 11:00:59 +09:00
  bf61f35870
• Merge branch 'master' into gameplay-paused-no-update
  Dan Balasescu · 2019-03-29 10:53:32 +09:00
  7ab24e35f9
• Restore previous resume behaviour for the time being
  Dean Herbert · 2019-03-29 10:52:26 +09:00
  759c5b3db9
• Merge pull request #4531 from peppy/testability-improvements

  Add ManualInputManager to screen tests

  Dan Balasescu · 2019-03-29 10:51:31 +09:00
  71c4fefe69
• Merge remote-tracking branch 'upstream/master' into correct-preview-loop
  Dean Herbert · 2019-03-29 10:31:15 +09:00
  3b1f83da1d
• Merge branch 'master' into testability-improvements
  Dan Balasescu · 2019-03-29 10:23:12 +09:00
  4c038e7f67
• Merge pull request #4528 from peppy/drawable-clear-safety

  Add safety against accidental clearing of DrawableHitObject children

  Dan Balasescu · 2019-03-29 10:23:00 +09:00
  fc41a7015a
• Merge branch 'master' into drawable-clear-safety
  Dan Balasescu · 2019-03-29 10:14:41 +09:00
  900c00ba59
• Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust
  Dean Herbert · 2019-03-29 00:39:51 +09:00
  8642886ffa
• Fix remaining framework changes
  Dean Herbert · 2019-03-29 00:29:14 +09:00
  2f5668f4e7
• Merge branch 'master' into sprite-icon-compatibility
  Dean Herbert · 2019-03-28 23:47:44 +09:00
  176b4ecc38
• Update framework
  Dean Herbert · 2019-03-28 23:25:31 +09:00
  bca8714905
• Merge pull request #4547 from peppy/fix-slider-ball-positional

  Fix slider ball not always receiving position in time

  Dan Balasescu · 2019-03-28 15:13:06 +09:00
  f134b9c886
• Fix slider ball not always receiving position in time
  Dean Herbert · 2019-03-28 12:42:28 +09:00
  8f5e769425
• Merge pull request #4494 from Joehuu/clean-overlays-code-1

  Remove specified depths of overlays

  Dean Herbert · 2019-03-28 11:27:36 +09:00
  fc59e6dec5
• Merge branch 'master' into clean-overlays-code-1
  Dean Herbert · 2019-03-28 11:17:29 +09:00
  23b5271ce4
• Merge pull request #4532 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-03-28 10:50:20 +09:00
  d756a5d987
• Merge branch 'master' into clean-overlays-code-1
  Joseph Madamba · 2019-03-27 10:32:13 -07:00
  cdf79ffe39
• Fix remaining game host regressions
  Dean Herbert · 2019-03-28 01:29:06 +09:00
  dfb7d78903
• Fix TestCaseDrawings regression
  Dean Herbert · 2019-03-28 01:24:48 +09:00
  cd65ea4865
• Allow ScreenTestCase to support content
  Dean Herbert · 2019-03-27 22:28:32 +09:00
  61b8fb0366
• Fix Loader and TestCaseLoaderAnimation
  Dean Herbert · 2019-03-27 22:28:25 +09:00
  5c4f2cefea
• Update icon test case
  Dean Herbert · 2019-03-27 21:44:13 +09:00
  a14701619e
• Fix storage regression
  Dean Herbert · 2019-03-27 20:58:07 +09:00
  1a0d1b238e
• Merge pull request #4541 from nyquillerium/background-test-fix

  Fix TestCaseBackgroundScreenBeatmap getting stuck

  Dean Herbert · 2019-03-27 20:27:32 +09:00
  842231e820
• Update icon usage to match framework changes
  Dean Herbert · 2019-03-27 19:29:27 +09:00
  de80fc0eac
• fix wedge bleeding into other elements (and being misaligned)
  Unknown · 2019-03-27 10:12:09 +01:00
  fea6adbf54
• Rename to BlockLoad
  David Zhao · 2019-03-27 17:34:58 +09:00
  2c059efbab
• Fix TestCaseBackgroundsScreenBeatmap
  David Zhao · 2019-03-27 14:33:50 +09:00
  be62cd9d72
• Merge pull request #4538 from peppy/fix-test-working-clock

  Fix TestWorkingBeatmap not running for times below zero

  Dan Balasescu · 2019-03-27 12:04:05 +09:00
  4e8945a2aa
• Fix key counter getting overridden
  Dean Herbert · 2019-03-27 10:31:21 +09:00
  3fcbc2eab3
• Add back adjustment container
  Dean Herbert · 2019-03-26 17:11:14 +09:00
  7cfc2f7dcb
• Fix cursor adding
  Dean Herbert · 2019-03-26 17:04:14 +09:00
  15821c7511
• Fix TestWorkingBeatmap not running for times below zero
  Dean Herbert · 2019-03-26 16:35:34 +09:00
  83076e32c7
• Rename KeyCounterCollection -> KeyCounterDisplay

  Also fix not working

  Dean Herbert · 2019-03-26 13:52:48 +09:00
  8658de5108
• Apply CI fixes
  Dean Herbert · 2019-03-26 13:50:30 +09:00
  2951d3e0e4