1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 19:26:43 +08:00
Commit Graph

28327 Commits

Author SHA1 Message Date
Dean Herbert
0e2d5213ce
Merge branch 'master' into low-hp-red-layer 2020-04-09 13:53:57 +09:00
Dean Herbert
4bfc738f5b
Merge pull request #7639 from santerinogelainen/master
Add top rank to the beatmap carousel
2020-04-08 23:36:47 +09:00
Dean Herbert
87b29007c2
Merge pull request #8626 from LittleEndu/arrow-easing
Don't allow new transformations for reverse arrow after it's hit
2020-04-08 23:34:02 +09:00
Dean Herbert
9bdc881b3c
Merge pull request #8677 from smoogipoo/fix-minwidth-override
Fix hidden notes due to 0 minimum width
2020-04-08 23:32:25 +09:00
Dean Herbert
825a9bcf42
Merge pull request #8681 from peppy/fix-drum-alignment
Fix osu!taiko input drum alignment for old skin versions
2020-04-08 23:11:33 +09:00
Dean Herbert
61d8cfd224 Fix triangle intro video being out of time 2020-04-08 19:51:55 +09:00
Dean Herbert
d786a2c5b3 Add alignment support for skin versions older than 2.1 2020-04-08 19:42:31 +09:00
Dean Herbert
4b16b2e720 Bump legacy skin version 2020-04-08 19:42:31 +09:00
Dean Herbert
40267cb1fe Add test sprites and make alignment initially better 2020-04-08 19:42:31 +09:00
Dan Balasescu
d0aa791ad4
Merge pull request #8680 from peppy/fix-slider-ball-blending
Fix slider ball and follow circle blending for legacy skins
2020-04-08 19:40:52 +09:00
Dan Balasescu
1c88ac31da
Merge branch 'master' into arrow-easing 2020-04-08 19:04:54 +09:00
Dean Herbert
067ec27859 Also fix slider repeat circles 2020-04-08 18:59:31 +09:00
Dean Herbert
69693ecac7
Merge pull request #8679 from peppy/fix-test-scene-column
Fix TestSceneColumn columns not getting a width
2020-04-08 18:47:02 +09:00
Dean Herbert
f3e909539d Fix slider ball and follow circle blending for legacy skins 2020-04-08 18:39:18 +09:00
smoogipoo
d13231eff7 Use ctor for default width 2020-04-08 18:23:24 +09:00
smoogipoo
7d787dde89 Move comparison to decoder 2020-04-08 18:17:45 +09:00
Dean Herbert
e6b87656ba Fix TestSceneColumn columns not getting a width 2020-04-08 18:04:53 +09:00
smoogipoo
2ddea018cf Fix hidden notes due to 0 minimum width 2020-04-08 17:15:59 +09:00
smoogipoo
83db6cebb6 Implement bottom stage image 2020-04-08 16:20:54 +09:00
smoogipoo
cd15b672eb Implement left and right stage images 2020-04-08 16:20:47 +09:00
Dan Balasescu
6575f589b4
Merge pull request #8673 from peppy/fix-tourney-ladder-dragging
Fix dragging tournament ladder too far causing it to disappear
2020-04-08 15:37:23 +09:00
smoogipoo
e429c274a9 Initial structure 2020-04-08 15:35:37 +09:00
Dan Balasescu
d774e7c324
Merge pull request #8674 from peppy/mania-default-key-area-clearance
Increase size of default osu!mania skin's keys to allow clearance with HUD
2020-04-08 14:36:33 +09:00
Dean Herbert
9db996a91f Increase size of default osu!mania skin's keys to allow clearance with HUD 2020-04-08 14:13:31 +09:00
Dean Herbert
3794b55eef Rename ManiaStage to Stage 2020-04-08 14:13:31 +09:00
Dean Herbert
f4dc604dbf Fix dragging tournament ladder too far causing it to disappear 2020-04-08 13:32:37 +09:00
Dean Herbert
d63cfdc024
Merge pull request #8669 from bdach/fix-legacy-skin-fallback
Fix legacy skin texture fallback logic
2020-04-08 10:47:11 +09:00
Dean Herbert
76dabf78e5
Merge pull request #8671 from Alchyr/goodbye
Fix Exit Confirmation "Goodbye" Spelling
2020-04-08 10:35:51 +09:00
Alchyr
737a3b608a Correct spelling 2020-04-07 17:34:18 -07:00
Bartłomiej Dach
f5f0b94944 Fix incorrect fallback logic
The recently-modified skin texture fallback logic was very subtly
incorrect. If at the end of the first loop no texture was found, it
would be checked for null to avoid setting scale adjust on a null
texture, but then returned anyway, bypassing the fallback logic for
subsequent possible paths entirely.

Invert the check and explicitly continue to the next fallback path
if neither a 2x, nor 1x texture with the given name is found in the
store.
2020-04-07 22:50:25 +02:00
Bartłomiej Dach
65db64e13e Add failing test cases 2020-04-07 22:41:20 +02:00
Dean Herbert
2e8e451c17
Merge pull request #8657 from smoogipoo/more-mania-colours
Implement mania judgement line/column background/column light colours
2020-04-08 00:48:28 +09:00
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
Endrik Tombak
0b70c20aa3 Merge branch 'master' of https://github.com/ppy/osu into arrow-easing 2020-04-07 17:16:56 +03:00
Endrik Tombak
16d906d769 Get rid of unnecessary removal 2020-04-07 17:16:06 +03: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