Commit Graph

21162 Commits

Author SHA1 Message Date
db1ff6d211 Fix video decoding loop running permanently in the background 2019-08-22 13:48:27 +09:00
04178058fb Bump SharpCompress from 0.23.0 to 0.24.0 (#5790)
Bump SharpCompress from 0.23.0 to 0.24.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-21 20:27:35 +09:00
6797f92b96 Merge branch 'master' into dependabot/nuget/SharpCompress-0.24.0 2019-08-21 20:15:23 +09:00
ae912082be Merge pull request #5792 from EVAST9919/simplify-caching
Simplify IPreviewTrackOwner caching in OsuFocusedOverlayContainer
2019-08-21 18:33:03 +09:00
727a6abaf7 Simplify caching 2019-08-21 12:16:30 +03:00
fb8d8f9438 Bump SharpCompress from 0.23.0 to 0.24.0
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.23...0.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-21 08:27:56 +00:00
5f0df7ba21 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>
2019-08-21 15:32:23 +09:00
28dfe072a5 Update one more blending mode change post-master merge 2019-08-21 15:11:46 +09:00
4186d2566a Remove unnecessary null checks 2019-08-21 15:11:33 +09:00
745bd58f37 Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 15:10:08 +09:00
8917f7cc95 Merge pull request #5776 from peppy/animated-slider-ball
Add slider ball animation support

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-21 15:02:35 +09:00
444f2b9387 Specify font size in a saner way 2019-08-21 15:01:50 +09:00
73bb540c23 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.821.0' into update-framework-blending 2019-08-21 14:30:28 +09:00
5c6a817788 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.iOS-2019.821.0' into update-framework-blending 2019-08-21 14:30:14 +09:00
6a48819055 Merge branch 'master' into update-framework-blending 2019-08-21 14:27:57 +09:00
9ce783fbf2 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>
2019-08-21 05:21:25 +00:00
ae7bedacc1 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>
2019-08-21 05:20:49 +00:00
5802ce74e8 Merge pull request #5759 from Game4all/music-playback-improvements
Prevent beatmap change during intro playback

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-21 14:15:02 +09:00
66a2eecb7a Merge remote-tracking branch 'upstream/master' into music-playback-improvements 2019-08-21 14:01:11 +09:00
724365c6d1 Minor tidying 2019-08-21 14:01:07 +09:00
cca64771dd Add comment about placement of default loading 2019-08-21 13:56:49 +09:00
aa8b7b60de Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 13:30:24 +09:00
62218613da Merge remote-tracking branch 'smoogipoo/spritetext-glyph-rework' into update-framework-blending 2019-08-21 13:30:19 +09:00
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
33083bcf40 Merge branch 'master' into animated-slider-ball 2019-08-21 13:15:45 +09:00
3c89afaf01 Merge pull request #5497 from jorolf/animated-legacy-skins
Make legacy skins animatable
2019-08-21 13:15:24 +09:00
82fe506f97 Merge branch 'master' into animated-legacy-skins 2019-08-21 13:03:11 +09:00
f9d35c7e1b Merge pull request #5775 from peppy/fix-skin-test-regression
Fix LegacySkin not checking for @2x hitcircle when deciding sizing
2019-08-21 12:55:56 +09:00
758f10b9fd Merge branch 'master' into fix-skin-test-regression 2019-08-21 12:45:47 +09:00
873a984f3b Merge pull request #5779 from iiSaLMaN/disallow-adding-bonus-judgements-to-statistics
Disallow adding bonus judgements to statistics
2019-08-21 12:21:37 +09:00
439d825dd1 Disallow adding bonus judgements' result to statistics 2019-08-20 18:39:29 +03:00
0de219dda4 Update with spritetext text builder changes 2019-08-20 19:03:57 +09:00
33946f0458 Fix CI issues and update comments. 2019-08-20 11:18:41 +02:00
4bffb0df84 Merge branch 'animated-legacy-skins' into animated-slider-ball 2019-08-20 18:14:17 +09:00
7d668c81fc 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.
2019-08-20 18:13:53 +09:00
78c7170e86 Don't show judgement type "none" 2019-08-20 17:47:58 +09:00
2066a93918 Fix file extension case #2 2019-08-20 17:47:58 +09:00
9f0a0b2fcb Fix file extension case #1 2019-08-20 17:47:58 +09:00
1616b4528d Merge branch 'master' into animated-legacy-skins 2019-08-20 17:40:18 +09:00
6dd638b327 Further improve legibility of texture lookup 2019-08-20 17:39:24 +09:00
9fbc8440fc Add actual testing of animations 2019-08-20 17:39:16 +09:00
84530b7839 Colour the correct layer 2019-08-20 15:02:07 +09:00
f7ce7c7d99 Merge branch 'fix-skin-test-regression' into animated-slider-ball 2019-08-20 14:09:53 +09:00
3b7cee2d45 Fix LegacySkin not checking for @2x hitcircle when deciding sizing 2019-08-20 13:50:16 +09:00
b5cb59faf2 Add default skin sprites and specular/diffuse layer support 2019-08-20 13:19:32 +09:00
550311698b Update slider test scene 2019-08-20 13:18:59 +09:00
62a24bf16d Fix a couple of rotation-related issues 2019-08-20 13:18:34 +09:00
caf8354f50 Merge branch 'master' into music-playback-improvements 2019-08-20 11:49:39 +09:00
d0766fa1cd Add slider ball animation support 2019-08-19 19:55:47 +09:00
539a27a557 Refactor texture lookup code 2019-08-19 19:23:54 +09:00