21195 Commits

This Branch

This Branch

All Branches

• Simplify moving average
  Andrei Zavatski · 2019-08-21 10:13:59 +03:00
  0ccfaeb8d9
• CI fixes
  Andrei Zavatski · 2019-08-21 09:58:47 +03:00
  a5acc913ea
• Use moving average to calculate arrow position
  Andrei Zavatski · 2019-08-21 09:40:15 +03:00
  a994ad9c84
• Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
  Andrei Zavatski · 2019-08-21 09:39:28 +03:00
  336f979480
• Update framework (#5783)

  Update framework
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
  Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>

  Dean Herbert · 2019-08-21 15:32:23 +09:00
  5f0df7ba21
• Add/remove displays only if necessary
  Andrei Zavatski · 2019-08-21 09:16:09 +03:00
  71cbc3525d
• Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
  Andrei Zavatski · 2019-08-21 09:15:48 +03:00
  ed2002f717
• Update one more blending mode change post-master merge
  Dean Herbert · 2019-08-21 15:11:46 +09:00
  28dfe072a5
• Remove unnecessary null checks
  Dean Herbert · 2019-08-21 15:11:33 +09:00
  4186d2566a
• Merge remote-tracking branch 'upstream/master' into update-framework-blending
  Dean Herbert · 2019-08-21 15:10:08 +09:00
  745bd58f37
• Merge pull request #5776 from peppy/animated-slider-ball

  Add slider ball animation support
  
  Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-08-21 15:02:35 +09:00
  8917f7cc95
• Specify font size in a saner way
  Dean Herbert · 2019-08-21 15:01:50 +09:00
  444f2b9387
• Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
  Andrei Zavatski · 2019-08-21 08:56:34 +03:00
  ab1586ff33
• Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.821.0' into update-framework-blending
  Dean Herbert · 2019-08-21 14:30:28 +09:00
  73bb540c23
• Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.iOS-2019.821.0' into update-framework-blending
  Dean Herbert · 2019-08-21 14:30:14 +09:00
  5c6a817788
• Merge branch 'master' into update-framework-blending
  Dean Herbert · 2019-08-21 14:27:57 +09:00
  6a48819055
• Bump ppy.osu.Framework.Android from 2019.816.0 to 2019.821.0

  Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.816.0 to 2019.821.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.816.0...2019.821.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-08-21 05:21:25 +00:00
  9ce783fbf2
• Bump ppy.osu.Framework.iOS from 2019.816.0 to 2019.821.0

  Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.816.0 to 2019.821.0.
  - [Release notes](https://github.com/ppy/osu-framework/releases)
  - [Commits](https://github.com/ppy/osu-framework/compare/2019.816.0...2019.821.0)
  
  Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

  dependabot-preview[bot] · 2019-08-21 05:20:49 +00:00
  ae7bedacc1
• Merge pull request #5759 from Game4all/music-playback-improvements

  Prevent beatmap change during intro playback
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-08-21 14:15:02 +09:00
  5802ce74e8
• Merge remote-tracking branch 'upstream/master' into music-playback-improvements
  Dean Herbert · 2019-08-21 14:01:11 +09:00
  66a2eecb7a
• Minor tidying
  Dean Herbert · 2019-08-21 14:01:07 +09:00
  724365c6d1
• Add comment about placement of default loading
  Dean Herbert · 2019-08-21 13:56:49 +09:00
  cca64771dd
• Merge remote-tracking branch 'upstream/master' into update-framework-blending
  Dean Herbert · 2019-08-21 13:30:24 +09:00
  aa8b7b60de
• Merge remote-tracking branch 'smoogipoo/spritetext-glyph-rework' into update-framework-blending
  Dean Herbert · 2019-08-21 13:30:19 +09:00
  62218613da
• Update framework
  Dean Herbert · 2019-08-21 13:29:50 +09:00
  48716f8f2b
• Merge branch 'master' into animated-slider-ball
  Dan Balasescu · 2019-08-21 13:15:45 +09:00
  33083bcf40
• Merge pull request #5497 from jorolf/animated-legacy-skins

  Make legacy skins animatable

  Dan Balasescu · 2019-08-21 13:15:24 +09:00
  3c89afaf01
• Merge branch 'master' into animated-legacy-skins
  Dan Balasescu · 2019-08-21 13:03:11 +09:00
  82fe506f97
• Merge pull request #5775 from peppy/fix-skin-test-regression

  Fix LegacySkin not checking for @2x hitcircle when deciding sizing

  Dan Balasescu · 2019-08-21 12:55:56 +09:00
  f9d35c7e1b
• Merge branch 'master' into fix-skin-test-regression
  Dan Balasescu · 2019-08-21 12:45:47 +09:00
  758f10b9fd
• Merge pull request #5779 from iiSaLMaN/disallow-adding-bonus-judgements-to-statistics

  Disallow adding bonus judgements to statistics

  Dan Balasescu · 2019-08-21 12:21:37 +09:00
  873a984f3b
• Disallow adding bonus judgements' result to statistics
  iiSaLMaN · 2019-08-20 18:39:29 +03:00
  439d825dd1
• Update with spritetext text builder changes
  smoogipoo · 2019-08-20 19:03:57 +09:00
  0de219dda4
• Fix CI issues and update comments.
  Lucas A · 2019-08-20 11:18:41 +02:00
  33946f0458
• Merge branch 'animated-legacy-skins' into animated-slider-ball
  Dean Herbert · 2019-08-20 18:14:17 +09:00
  4bffb0df84
• Avoid test failures

  This is a bit of a workaround (I'm pretty sure these tests are not running correctly on appveyor) but I think it will do for now. Cannot repro failures locally at all.

  Dean Herbert · 2019-08-20 18:13:53 +09:00
  7d668c81fc
• Don't show judgement type "none"
  Dean Herbert · 2019-08-20 17:47:58 +09:00
  78c7170e86
• Fix file extension case #2
  Dean Herbert · 2019-08-20 17:47:58 +09:00
  2066a93918
• Fix file extension case #1
  Dean Herbert · 2019-08-20 17:47:58 +09:00
  9f0a0b2fcb
• Merge branch 'master' into animated-legacy-skins
  Dean Herbert · 2019-08-20 17:40:18 +09:00
  1616b4528d
• Further improve legibility of texture lookup
  Dean Herbert · 2019-08-20 17:39:24 +09:00
  6dd638b327
• Add actual testing of animations
  Dean Herbert · 2019-08-20 17:39:16 +09:00
  9fbc8440fc
• Add missing blank line
  Andrei Zavatski · 2019-08-20 09:03:31 +03:00
  f72edb8bf8
• Colour the correct layer
  Dean Herbert · 2019-08-20 15:02:07 +09:00
  84530b7839
• Add xmldoc for not obvious const
  Andrei Zavatski · 2019-08-20 08:51:41 +03:00
  596ee150c6
• Move HitErrorDisplayOverlay back to the HUD
  Andrei Zavatski · 2019-08-20 08:45:51 +03:00
  9f64e09625
• Merge branch 'fix-skin-test-regression' into animated-slider-ball
  Dean Herbert · 2019-08-20 14:09:53 +09:00
  f7ce7c7d99
• DefaultHitErrorDisplay -> BarHitErrorDisplay
  Andrei Zavatski · 2019-08-20 08:03:17 +03:00
  d337f9b482
• Simplify bar building
  Andrei Zavatski · 2019-08-20 08:00:09 +03:00
  c4251d512e
• Fix LegacySkin not checking for @2x hitcircle when deciding sizing
  Dean Herbert · 2019-08-20 13:50:16 +09:00
  3b7cee2d45