19539 Commits

This Branch

This Branch

All Branches

• Remove unnecessary multi-slider tracking logic
  David Zhao · 2019-04-24 18:25:38 +09:00
  8f101e4f60
• Merge branch 'master' into flashlight-dim
  Dean Herbert · 2019-04-24 17:01:11 +09:00
  4f31eee5ad
• Reword and reoganise logic
  Dean Herbert · 2019-04-24 16:58:13 +09:00
  67382724f6
• Only track logo if we're still the current screen
  David Zhao · 2019-04-24 16:20:51 +09:00
  8222923ab8
• Merge branch 'master' into sh-xh-grading-2
  iiSaLMaN · 2019-04-24 10:08:08 +03:00
  c5ca337e66
• Merge branch 'frame-stability-initial-seek' into fix-lead-in-issues
  Dean Herbert · 2019-04-24 15:56:19 +09:00
  73401ebf65
• Remove unnecessary using statement
  Dean Herbert · 2019-04-24 15:55:51 +09:00
  f273f5daae
• Fix tests running under nUnit and running multiple times in concession
  Dean Herbert · 2019-04-24 15:46:49 +09:00
  3b36a4982d
• Call ProcessFrame on the userOffsetClock after a seek

  Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).

  Dean Herbert · 2019-04-24 15:28:14 +09:00
  bb69330e9f
• Fix (legacy) AudioLeadIn being used incorrectly.

  This lead-in is intended to specify a value before zero, not a value before the start time.
  Also removes an unnecessary ProcessFrame call (it happens within Seek itself).

  Dean Herbert · 2019-04-24 15:28:14 +09:00
  efaedafc08
• Ensure there is enough time before the first object in osu! (roughly following osu-stable specs)
  Dean Herbert · 2019-04-24 15:28:14 +09:00
  e69963e60e
• Add tests for FrameStabilityContainer
  Dean Herbert · 2019-04-24 15:25:53 +09:00
  a3e7ec0a14
• Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek
  Dean Herbert · 2019-04-24 15:25:53 +09:00
  60328cf1fb
• Fix FrameStabilityContainer performing frame-stable seeks
  Dean Herbert · 2019-04-24 15:25:52 +09:00
  80e1568e97
• Shorten multiplayer header to multi (#4669)

  Shorten multiplayer header to multi

  Dean Herbert · 2019-04-24 10:32:21 +09:00
  65f5318298
• Merge branch 'master' into sh-xh-grading-2
  iiSaLMaN · 2019-04-23 10:31:17 +03:00
  a29c7d81ee
• Shorten multiplayer header to multi
  Joehu · 2019-04-22 22:44:43 -07:00
  0838206ddd
• Remove fade in, update comment
  David Zhao · 2019-04-23 14:23:09 +09:00
  9890884726
• Fix gameplay cursor being hidden in tests/replays (#4667)

  Fix gameplay cursor being hidden in tests/replays

  Dean Herbert · 2019-04-23 13:54:44 +09:00
  3bfd2a4d2f
• Add comment
  smoogipoo · 2019-04-23 13:45:51 +09:00
  6c568d228f
• Fix gameplay cursor being hidden in tests/replays
  smoogipoo · 2019-04-23 13:32:44 +09:00
  6add395288
• Fix pause tests
  Dean Herbert · 2019-04-23 11:54:41 +09:00
  52336e9062
• Merge branch 'master' into update-framework
  Dan Balasescu · 2019-04-23 11:31:17 +09:00
  0bf17081f6
• Fix possible exit from non-current screen (#4663)

  Fix possible exit from non-current screen
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-04-23 09:52:20 +09:00
  b8712b36ec
• Merge branch 'master' into fix-multiplayer-crash
  Dean Herbert · 2019-04-23 09:28:03 +09:00
  c88a11a38f
• Merge branch 'master' into sh-xh-grading-2
  iiSaLMaN · 2019-04-22 19:39:20 +03:00
  a6b60a2fc2
• Fix possible exit from non-current screen
  smoogipoo · 2019-04-22 19:24:57 +09:00
  414d555484
• Update framework
  Dean Herbert · 2019-04-22 19:17:58 +09:00
  1f18c08cfc
• Merge branch 'master' into update-framework
  Dean Herbert · 2019-04-22 19:17:14 +09:00
  5fe45c9bed
• Fix hold for menu button's icon being incorrect (#4662)

  Fix hold for menu button's icon being incorrect
  
  Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>

  Dean Herbert · 2019-04-22 19:16:29 +09:00
  ffd8268076
• Standardise health adjustment process across all rulesets (#4660)

  Standardise health adjustment process across all rulesets
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-04-22 19:16:14 +09:00
  c1b649b0fb
• Merge branch 'master' into hp-rewind
  Dean Herbert · 2019-04-22 19:02:41 +09:00
  5313ba2938
• Merge branch 'master' into fix-hold-for-menu-icon
  Dan Balasescu · 2019-04-22 18:57:43 +09:00
  8fc0bf24c7
• Merge pull request #4661 from peppy/fix-pause-tests

  Fix pause tests and cursor visibility

  Dan Balasescu · 2019-04-22 18:56:41 +09:00
  63fd3034ca
• Fix hold for menu button's icon being incorrect
  Dean Herbert · 2019-04-22 18:47:28 +09:00
  48e82d4b1c
• Fix incorrect seek target
  Dean Herbert · 2019-04-22 18:45:58 +09:00
  6856571f17
• Remove delay on entering player
  Dean Herbert · 2019-04-22 18:29:58 +09:00
  55c5ef898d
• Fix pause tests
  Dean Herbert · 2019-04-22 18:29:51 +09:00
  908eee9942
• Rename method + add xmldoc
  smoogipoo · 2019-04-22 18:08:15 +09:00
  aeae759fcd
• Fix catch awarding too much hp
  smoogipoo · 2019-04-22 18:02:57 +09:00
  910b9df2d5
• Make hp work + cleanup
  smoogipoo · 2019-04-22 18:02:49 +09:00
  4edb17a88a
• Implement hp increase for osu!
  smoogipoo · 2019-04-22 17:24:42 +09:00
  144e6012dc
• Make catch provide some HP at DrainRate=10
  smoogipoo · 2019-04-22 17:24:22 +09:00
  78c844e259
• Remove delay on entering player
  Dean Herbert · 2019-04-22 17:06:40 +09:00
  b3c496d72c
• Fix pause tests
  Dean Herbert · 2019-04-22 17:06:22 +09:00
  034643b835
• Implement hp increase for taiko
  smoogipoo · 2019-04-22 17:04:46 +09:00
  b59f23d094
• Implement hp increase for mania
  smoogipoo · 2019-04-22 17:04:18 +09:00
  4c5f41e40f
• Implement approximate hp increase for catch
  smoogipoo · 2019-04-22 16:59:14 +09:00
  d7919544fe
• Implement hp at base ScoreProcessor
  smoogipoo · 2019-04-22 16:51:38 +09:00
  fbb4e9df04
• Merge branch 'master' into flashlight-dim
  David Zhao · 2019-04-22 16:41:25 +09:00
  b2b7143ed3