1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:47:29 +08:00
Commit Graph

28029 Commits

Author SHA1 Message Date
Dan Balasescu
35d66c3c1d
Fix missing comma 2020-04-07 23:37:30 +09:00
Dean Herbert
2062087155
Merge branch 'master' into more-mania-colours 2020-04-07 23:36:42 +09:00
Dean Herbert
955361be08
Merge pull request #8656 from peppy/per-ruleset-skinnable-tests
Add per-ruleset skinnable test scenes to correct dynamic compilation cases
2020-04-07 23:35:52 +09:00
Dean Herbert
6612332b31
Merge pull request #8642 from smoogipoo/mania-skin-note-images
Implement mania note + key image configs
2020-04-07 23:23:30 +09:00
Dan Balasescu
7951a52a15
Merge branch 'master' into per-ruleset-skinnable-tests 2020-04-07 22:59:42 +09:00
Dean Herbert
9ff4458fd6
Merge branch 'master' into mania-skin-note-images 2020-04-07 22:41:22 +09:00
Dean Herbert
2118998243
Merge pull request #8653 from smoogipoo/better-mania-scrollspeed
Fix inconsistent scroll speeds in mania
2020-04-07 22:38:55 +09:00
Dean Herbert
780784217d
Merge pull request #8652 from smoogipoo/mania-multiple-columnwidth
Make note height scale by minimum column width
2020-04-07 22:38:12 +09:00
Dean Herbert
fcb3d3091a
Merge pull request #8660 from peppy/better-resources-retrieval
Retrieve dll resources using a more reliable method
2020-04-07 22:31:50 +09:00
Dean Herbert
e597ee9ffd Update framework 2020-04-07 21:52:15 +09:00
Dean Herbert
f0443bca3c
Merge pull request #8643 from smoogipoo/fix-legacy-version
Make version-less skins fallback to version 1.0
2020-04-07 21:28:06 +09:00
Dean Herbert
c9872f1d93 Retrieve dll resources using a more reliable method 2020-04-07 18:55:03 +09:00
smoogipoo
2568f3f588 Fix off-by-one indexing 2020-04-07 17:11:32 +09:00
smoogipoo
11d58fb7f6 Implement column background and light colours 2020-04-07 16:53:55 +09:00
smoogipoo
9fd73492ca Implement judgement line colour 2020-04-07 16:53:55 +09:00
smoogipoo
9cfeb60afc Fix missed speed removal in mania 2020-04-07 16:30:58 +09:00
Dean Herbert
9071bf5cbb Fix mania test scene not using mania skinnable test scene 2020-04-07 16:20:13 +09:00
Dean Herbert
0a340bac5a Ensure the correct (up-to-date) ruleset is retrieved 2020-04-07 16:20:13 +09:00
Dean Herbert
2c840c52a3 Add skinnable test scene per ruleset to better allow dynamic compilation 2020-04-07 16:20:13 +09:00
Dean Herbert
39fd297d7d
Merge pull request #8650 from peppy/skinnable-test-scene-recompilation
Fix SkinnableTestScene losing test resources on dynamic recompilation
2020-04-07 16:20:00 +09:00
smoogipoo
3ecb99462f Make note height scale by minimum column width 2020-04-07 16:07:18 +09:00
Dan Balasescu
1a1301b7fc
Merge pull request #8648 from peppy/fix-storyboard-video-offset
Fix storyboard videos being offset incorrectly
2020-04-07 14:53:32 +09:00
Dan Balasescu
de99eab52a
Merge branch 'master' into fix-storyboard-video-offset 2020-04-07 14:30:37 +09:00
Dan Balasescu
5694898e7c
Merge pull request #8619 from peppy/fix-sliderball-acent-colour
Fix sliderball accent colour not being set correctly
2020-04-07 14:14:45 +09:00
Dan Balasescu
bbbc13021b
Merge branch 'master' into fix-sliderball-acent-colour 2020-04-07 13:53:48 +09:00
Dean Herbert
8506029237 Fix SkinnableTestScene losing test resources on dynamic recompilation 2020-04-07 13:46:37 +09:00
Dan Balasescu
7a1104b575
Merge pull request #8624 from Joehuu/fix-results-star-display-alignment
Fix results star rating display not being centered when no mods are present
2020-04-07 12:52:19 +09:00
Dan Balasescu
5758a9fa4d
Merge branch 'master' into fix-results-star-display-alignment 2020-04-07 12:28:33 +09:00
Dan Balasescu
cc9757f958
Merge pull request #8630 from iiSaLMaN/add-break-period-constructor
Add a simple constructor for BreakPeriod
2020-04-07 12:13:40 +09:00
Dan Balasescu
556e53fb1d
Merge pull request #8613 from LittleEndu/animate-judgements
Make legacy skins use startAtCurrentTime by default
2020-04-07 11:52:25 +09:00
smoogipoo
5dfa2a2bad Fix step namings 2020-04-07 11:50:40 +09:00
Dan Balasescu
6fc9507cbf
Merge branch 'master' into add-break-period-constructor 2020-04-07 11:39:31 +09:00
Dan Balasescu
6dbe8cd575
Merge branch 'master' into animate-judgements 2020-04-07 11:29:07 +09:00
Dean Herbert
b7308f5ed4 Fix storyboard videos being offset incorrectly 2020-04-07 00:26:38 +09:00
Dean Herbert
e610b5e5b7
Merge pull request #8638 from ppy/dependabot/nuget/Microsoft.Build.Traversal-2.0.34
Bump Microsoft.Build.Traversal from 2.0.32 to 2.0.34
2020-04-06 22:15:43 +09:00
dependabot-preview[bot]
678ac0f9e1
Bump Microsoft.Build.Traversal from 2.0.32 to 2.0.34
Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.32 to 2.0.34.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.32...Microsoft.Build.Traversal.2.0.34)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 12:08:26 +00:00
Dean Herbert
1c4ae3781f
Merge pull request #8639 from ppy/dependabot/nuget/SharpCompress-0.25.0
Bump SharpCompress from 0.24.0 to 0.25.0
2020-04-06 21:07:11 +09:00
dependabot-preview[bot]
9ed0560da3
Bump SharpCompress from 0.24.0 to 0.25.0
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.24...0.25)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 11:37:56 +00:00
Dan Balasescu
d318dac94e
Merge pull request #8644 from peppy/update-framework
Update framework
2020-04-06 20:36:43 +09:00
Dean Herbert
00f390c850 Update framework 2020-04-06 20:13:53 +09:00
smoogipoo
a4208f35c4 Make versionless skins fallback to version 1.0 2020-04-06 19:36:17 +09:00
smoogipoo
8438ee7e07 Improve testing 2020-04-06 19:35:27 +09:00
Dean Herbert
17ed2a4d93
Merge pull request #8641 from smoogipoo/fix-parse-performance
Fix performance when parsing mania skins
2020-04-06 19:27:29 +09:00
smoogipoo
db6db861c0 Implement mania note + key image configs 2020-04-06 19:04:02 +09:00
smoogipoo
707a6269b3 Fix incorrect key texture lookup 2020-04-06 19:03:37 +09:00
smoogipoo
eff17c2da5 Allow legacy skin textures from subpaths 2020-04-06 19:03:15 +09:00
smoogipoo
0182448262 Fix performance when parsing mania skins 2020-04-06 18:35:39 +09:00
Dean Herbert
bad1bb6618
Merge pull request #8489 from LittleEndu/test-snaking
Write a test for slider snaking
2020-04-06 17:12:20 +09:00
Dean Herbert
49e082b708
Merge branch 'master' into test-snaking 2020-04-06 16:47:29 +09:00
Dean Herbert
a4b4b7df21 Fix follow points not starting at correct time 2020-04-06 13:04:46 +09:00