1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 00:12:57 +08:00
Commit Graph

21967 Commits

Author SHA1 Message Date
Dean Herbert
5325982f49
Merge pull request #5807 from smoogipoo/remove-more-margins
Remove bottom margin from show more button
2019-08-23 12:57:25 +09:00
smoogipoo
a30567394e Remove bottom margin from show more button 2019-08-23 12:39:33 +09:00
Andrei Zavatski
f4d2bb036b Expand KudosuAction list 2019-08-22 16:50:54 +03:00
Andrei Zavatski
67e0a2e35e Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-22 16:33:25 +03:00
iiSaLMaN
66d8440167 Move non-bank samples logic to LegacySkin 2019-08-22 12:50:47 +03:00
Dean Herbert
82209aed82
Merge branch 'master' into humanizer-fallback 2019-08-22 17:58:40 +09:00
Shane Woolcock
76d34967a4
Merge pull request #5801 from peppy/fix-decoding-loop
Fix video decoding loop running permanently in the background
2019-08-22 17:13:30 +09:30
Shane Woolcock
f19b5ba570
Merge branch 'master' into fix-decoding-loop 2019-08-22 17:02:13 +09:30
Dean Herbert
8018aba852
Merge branch 'master' into kudosu-info 2019-08-22 14:30:26 +09:00
Dan Balasescu
f9dcddd7fd
Merge pull request #5796 from peppy/fix-spacing-regressions
Fix a few icon spacing regressions
2019-08-22 14:24:53 +09:00
Dean Herbert
db1ff6d211 Fix video decoding loop running permanently in the background 2019-08-22 13:48:27 +09:00
Dean Herbert
4f98361da3 One more offset removed 2019-08-21 22:22:03 +09:00
Dean Herbert
acc07c1d65 Remove mod icon offset 2019-08-21 22:18:29 +09:00
Dean Herbert
7bf430afd5 Add padding back to difficulty icons on carousel 2019-08-21 21:16:06 +09:00
iiSaLMaN
87f3184fcc Try retrieving samples without bank names
Fallback for spinner bonus samples
2019-08-21 15:14:33 +03:00
Dean Herbert
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
Dean Herbert
6797f92b96
Merge branch 'master' into dependabot/nuget/SharpCompress-0.24.0 2019-08-21 20:15:23 +09:00
Dean Herbert
ae912082be
Merge pull request #5792 from EVAST9919/simplify-caching
Simplify IPreviewTrackOwner caching in OsuFocusedOverlayContainer
2019-08-21 18:33:03 +09:00
Andrei Zavatski
727a6abaf7 Simplify caching 2019-08-21 12:16:30 +03:00
dependabot-preview[bot]
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
Andrei Zavatski
0ccfaeb8d9 Simplify moving average 2019-08-21 10:13:59 +03:00
Andrei Zavatski
a5acc913ea CI fixes 2019-08-21 09:58:47 +03:00
Andrei Zavatski
a994ad9c84 Use moving average to calculate arrow position 2019-08-21 09:40:15 +03:00
Andrei Zavatski
336f979480 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 09:39:28 +03:00
Dean Herbert
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
Andrei Zavatski
71cbc3525d Add/remove displays only if necessary 2019-08-21 09:16:09 +03:00
Andrei Zavatski
ed2002f717 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 09:15:48 +03:00
Dean Herbert
28dfe072a5 Update one more blending mode change post-master merge 2019-08-21 15:11:46 +09:00
Dean Herbert
4186d2566a Remove unnecessary null checks 2019-08-21 15:11:33 +09:00
Dean Herbert
745bd58f37 Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 15:10:08 +09:00
Dean Herbert
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
Dean Herbert
444f2b9387 Specify font size in a saner way 2019-08-21 15:01:50 +09:00
Andrei Zavatski
ab1586ff33 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 08:56:34 +03:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
6a48819055 Merge branch 'master' into update-framework-blending 2019-08-21 14:27:57 +09:00
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Dean Herbert
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
Dean Herbert
66a2eecb7a Merge remote-tracking branch 'upstream/master' into music-playback-improvements 2019-08-21 14:01:11 +09:00
Dean Herbert
724365c6d1 Minor tidying 2019-08-21 14:01:07 +09:00
Dean Herbert
cca64771dd Add comment about placement of default loading 2019-08-21 13:56:49 +09:00
Dean Herbert
aa8b7b60de Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 13:30:24 +09:00
Dean Herbert
62218613da Merge remote-tracking branch 'smoogipoo/spritetext-glyph-rework' into update-framework-blending 2019-08-21 13:30:19 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dan Balasescu
33083bcf40
Merge branch 'master' into animated-slider-ball 2019-08-21 13:15:45 +09:00
Dan Balasescu
3c89afaf01
Merge pull request #5497 from jorolf/animated-legacy-skins
Make legacy skins animatable
2019-08-21 13:15:24 +09:00
Dan Balasescu
82fe506f97
Merge branch 'master' into animated-legacy-skins 2019-08-21 13:03:11 +09:00
Dan Balasescu
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
Dan Balasescu
758f10b9fd
Merge branch 'master' into fix-skin-test-regression 2019-08-21 12:45:47 +09:00