1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 04:27:34 +08:00
Commit Graph

28307 Commits

Author SHA1 Message Date
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
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
smoogipoo
ed3e0a01e1 Re-namespace into song select 2020-04-07 15:31:22 +09:00
smoogipoo
ed17a1c990 Improve visual display 2020-04-07 15:30:06 +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
smoogipoo
933314d724 Remove unnecessary method 2020-04-07 14:50:11 +09:00
smoogipoo
c46ea7bdef Add disposal, prevent memory leaks 2020-04-07 14:49:24 +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
smoogipoo
d1e7621298 Merge branch 'master' into santerinogelainen-master 2020-04-07 13:52:56 +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