Dean Herbert
444f2b9387
Specify font size in a saner way
2019-08-21 15:01:50 +09: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
Dan Balasescu
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
iiSaLMaN
439d825dd1
Disallow adding bonus judgements' result to statistics
2019-08-20 18:39:29 +03:00
smoogipoo
0de219dda4
Update with spritetext text builder changes
2019-08-20 19:03:57 +09:00
Lucas A
33946f0458
Fix CI issues and update comments.
2019-08-20 11:18:41 +02:00
Dean Herbert
4bffb0df84
Merge branch 'animated-legacy-skins' into animated-slider-ball
2019-08-20 18:14:17 +09:00
Dean Herbert
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
Dean Herbert
78c7170e86
Don't show judgement type "none"
2019-08-20 17:47:58 +09:00
Dean Herbert
2066a93918
Fix file extension case #2
2019-08-20 17:47:58 +09:00
Dean Herbert
9f0a0b2fcb
Fix file extension case #1
2019-08-20 17:47:58 +09:00
Dean Herbert
1616b4528d
Merge branch 'master' into animated-legacy-skins
2019-08-20 17:40:18 +09:00
Dean Herbert
6dd638b327
Further improve legibility of texture lookup
2019-08-20 17:39:24 +09:00
Dean Herbert
9fbc8440fc
Add actual testing of animations
2019-08-20 17:39:16 +09:00
Dean Herbert
84530b7839
Colour the correct layer
2019-08-20 15:02:07 +09:00
Dean Herbert
f7ce7c7d99
Merge branch 'fix-skin-test-regression' into animated-slider-ball
2019-08-20 14:09:53 +09:00
Dean Herbert
3b7cee2d45
Fix LegacySkin not checking for @2x hitcircle when deciding sizing
2019-08-20 13:50:16 +09:00
Dean Herbert
b5cb59faf2
Add default skin sprites and specular/diffuse layer support
2019-08-20 13:19:32 +09:00
Dean Herbert
550311698b
Update slider test scene
2019-08-20 13:18:59 +09:00
Dean Herbert
62a24bf16d
Fix a couple of rotation-related issues
2019-08-20 13:18:34 +09:00
Dean Herbert
caf8354f50
Merge branch 'master' into music-playback-improvements
2019-08-20 11:49:39 +09:00
Desconocidosmh
77e9e89fec
Refactoring
2019-08-19 20:45:23 +02:00
Desconocidosmh
9bd844bf4d
Make comment more informative
2019-08-19 19:54:22 +02:00
Desconocidosmh
9732f5d622
Add Swell to GetNextObject() check
2019-08-19 17:28:32 +02:00
Desconocidosmh
eb83e36e0f
Make TaikoAutoGenerator unpress sooner
2019-08-19 17:15:08 +02:00
Desconocidosmh
b3556403aa
Make GetNextObject() a virtual method
2019-08-19 16:18:25 +02:00
Dean Herbert
d0766fa1cd
Add slider ball animation support
2019-08-19 19:55:47 +09:00
Dean Herbert
539a27a557
Refactor texture lookup code
2019-08-19 19:23:54 +09:00
Dean Herbert
d02b8d14f7
Avoid unnecessary texture retrieval for non-animated sprites
2019-08-19 17:47:59 +09:00
Dean Herbert
d224405bc6
Rename const and make more available
2019-08-19 17:46:05 +09:00
Dean Herbert
4356f2ef9f
Add sample usage of looping skinnable
2019-08-19 17:45:54 +09:00
Dean Herbert
9ea4921e2b
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
...
Add tooltips to difficulty icons with extra details
2019-08-19 17:23:13 +09:00
Dan Balasescu
e6860319e3
Merge pull request #5768 from peppy/centre-beatmap-panels
...
Centre beatmap panels in profile overlay
2019-08-19 14:06:45 +09:00
Dan Balasescu
18ee2f5e99
Merge branch 'master' into centre-beatmap-panels
2019-08-19 13:27:40 +09:00
