17636 Commits

This Branch

This Branch

All Branches

• Merge pull request #4537 from peppy/stable-storyboard-ordering

  Add stable storyboard element ordering
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-03-29 14:15:26 +09:00
  bda8ce2dbb
• Merge pull request #4521 from peppy/hitobject-drawable-representation

  Fix DrawableRuleset drawable creation method's name

  Dean Herbert · 2019-03-29 14:08:23 +09:00
  3e8952b087
• Adjust comment
  Dan Balasescu · 2019-03-29 14:02:19 +09:00
  e45c08ad23
• Merge pull request #4539 from peppy/better-player-flags

  Remove read/write player flags

  Dan Balasescu · 2019-03-29 13:59:29 +09:00
  ac58815907
• Merge branch 'master' into better-player-flags
  Dean Herbert · 2019-03-29 13:45:45 +09:00
  202a0086cc
• Merge pull request #4548 from peppy/framed-replay-handler-fixes

  Fix FramedReplayInputHandler frame handling

  Dan Balasescu · 2019-03-29 13:37:06 +09:00
  dc6b438f06
• Merge branch 'master' into framed-replay-handler-fixes
  Dean Herbert · 2019-03-29 12:59:51 +09:00
  c72705217a
• Merge pull request #4542 from smoogipoo/convert-ranking-statistics

  Fix incorrect statistics being shown in results
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-03-29 12:59:44 +09:00
  ad44116845
• Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
  Dean Herbert · 2019-03-29 12:59:26 +09:00
  14cef94a53
• Merge branch 'master' into stable-storyboard-ordering
  Dean Herbert · 2019-03-29 12:44:09 +09:00
  0439216f7e
• Merge branch 'master' into convert-ranking-statistics
  Dean Herbert · 2019-03-29 12:42:49 +09:00
  a71e9fdb0e
• Merge pull request #4020 from HoLLy-HaCKeR/ctb-pp

  Add Catch PerformanceCalculator
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-03-29 12:42:26 +09:00
  47665f7a81
• Remove unnecessary set
  Dean Herbert · 2019-03-29 12:38:47 +09:00
  e7b38cdc75
• Split out current/next frame conditionals for readability
  Dean Herbert · 2019-03-29 12:38:40 +09:00
  5b0aa7bf8d
• Merge branch 'master' into ctb-pp
  Dean Herbert · 2019-03-29 12:34:17 +09:00
  19825cf237
• Merge pull request #4543 from Aergwyn/wedge-fix

  Fix WedgeBackground bleeding into other elements
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-03-29 12:34:03 +09:00
  4d66b7e1b9
• Merge branch 'master' into ctb-pp
  Dean Herbert · 2019-03-29 12:24:47 +09:00
  e5b49b1657
• 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
• Add important section rewind tests
  Dean Herbert · 2019-03-29 11:37:12 +09:00
  82b9dfdeb1
• 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 interpolation nullrefs
  Dean Herbert · 2019-03-29 00:35:26 +09:00
  d770dac3bc
• Merge remote-tracking branch 'upstream/master' into framed-replay-handler-fixes
  Dean Herbert · 2019-03-29 00:32:03 +09:00
  6e41506766
• 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
• Fix many behavioural issues and add tests
  Dean Herbert · 2019-03-28 19:28:13 +09:00
  70f99400ad
• 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
• Merge branch 'framed-replay-handler-fixes' into better-player-flags
  Dean Herbert · 2019-03-28 15:09:46 +09:00
  5b92c93e18
• Fix handlers for other rulesets
  Dean Herbert · 2019-03-28 15:09:06 +09:00
  09a7950a3b