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

28173 Commits

Author SHA1 Message Date
Dean Herbert
cc0bcea6e5
Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup
Cleanup handling of hitobject updates
2020-04-09 21:32:58 +09:00
Dean Herbert
a457880eaa
Merge pull request #8695 from smoogipoo/fix-timeline-crash
Fix crash when trying to edit long beatmaps
2020-04-09 21:05:25 +09:00
smoogipoo
ecd7ce4b98 Fix test scene 2020-04-09 21:00:23 +09:00
Dean Herbert
f961ae862a
Merge pull request #8694 from smoogipoo/fix-encoder-nullref
Fix possible legacy beatmap encoder nullref
2020-04-09 20:44:08 +09:00
smoogipoo
683302a77d Fix crash when trying to edit long beatmaps 2020-04-09 20:25:26 +09:00
smoogipoo
b900f229e7 Fix possible legacy beatmap encoder nullref 2020-04-09 20:21:42 +09:00
smoogipoo
ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +09:00
Andrei Zavatski
134feefa14 Remove bindable 2020-04-09 13:10:09 +03:00
Andrei Zavatski
2d3ea95469 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-04-09 13:06:22 +03:00
Dean Herbert
e8f836a410
Merge pull request #8454 from TheWildTree/update-overlay-headers
Update overlay header elements to match osu-web
2020-04-09 17:17:03 +09:00
Dean Herbert
4217484799
Merge pull request #8676 from smoogipoo/mania-stage-background-skinning
Implement mania stage bottom/left/right images
2020-04-09 16:57:12 +09:00
Dean Herbert
e10576325c
Merge branch 'master' into update-overlay-headers 2020-04-09 16:29:34 +09:00
Dean Herbert
cb6372acac
Merge branch 'master' into mania-stage-background-skinning 2020-04-09 15:37:48 +09:00
Dean Herbert
53b2f58eda
Merge branch 'master' into overlay-scroll-container 2020-04-09 15:05:49 +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