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

55972 Commits

Author SHA1 Message Date
Dan Balasescu
d63f196626 Merge branch 'master' into fix-mania-rewinding 2022-10-07 20:45:56 +09:00
Dan Balasescu
073351498e
Merge pull request #20519 from peppy/fix-leaderboard-first-place-fade
Fix fade being applied for too long when leaderboard scrolls to start
2022-10-07 20:42:18 +09:00
Dan Balasescu
c18d4afdcc Merge branch 'master' into fix-leaderboard-first-place-fade 2022-10-07 19:55:16 +09:00
Dan Balasescu
0fb4ac4733
Merge pull request #20603 from peppy/bg-dim-reduce
Adjust out-of-the-box background dim back down to 70%
2022-10-07 19:40:13 +09:00
Dan Balasescu
57e4d6cc4a
Merge pull request #20562 from peppy/fix-score-submission-crash
Fix potential crash when score submission token retrival fails
2022-10-07 19:24:35 +09:00
Dan Balasescu
b5746f5f20
Merge pull request #20602 from peppy/mania-fix-object-colouring
Fix osu!mania not colours not always updating when switching skins
2022-10-07 19:22:55 +09:00
Dean Herbert
a8742f0cc3 Adjust out-of-the-box background dim back down to 70%
It was previously bumped from 60% to 80%, but I've recently
felt that this is too high as a default, and takes away from storyboards
and video backgrounds.
2022-10-07 18:47:32 +09:00
Dan Balasescu
107777a5e8
Merge pull request #20601 from peppy/argon-mania-note
Add "argon" note and stage design for osu!mania
2022-10-07 18:33:18 +09:00
Dean Herbert
52ad766f86 Remove manual binding of nested objects in DrawableManiaHitObject
This is now handled by `Column` itself. Leaving the logic here as well
will cause a circular bindable flow and stack overflow.
2022-10-07 18:25:55 +09:00
Dean Herbert
4b772643e9 Use bindable flow for transfer of accent colour from columns to hit objects
This fixes the case where changing a skin during gameplay runtime does
not correctly convey colour information to off-screen `DrawableHitObject`s.
2022-10-07 18:25:08 +09:00
Dean Herbert
42afc8e568
Merge branch 'master' into fix-mania-rewinding 2022-10-07 18:17:19 +09:00
Dan Balasescu
721189b23a
Merge branch 'master' into argon-mania-note 2022-10-07 17:34:11 +09:00
Dan Balasescu
d35bb56d55
Merge pull request #20592 from peppy/mania-column-refactor
Refactor osu!mania skinning to allow skins to specify column accent colours
2022-10-07 17:33:58 +09:00
Dean Herbert
c7405d1c1c
Add missing immediate application of AccentColour in DefaultKeyArea
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2022-10-07 17:00:10 +09:00
Dean Herbert
98b578e8e6 Remove left-over incorrect fallback logic
This was moved to `ManiaClassicSkinTransformer`.
2022-10-07 16:12:27 +09:00
Dean Herbert
207c76bdec Fix column lighting and key area not handling rewind correctly 2022-10-07 15:46:11 +09:00
Dean Herbert
e81f550150 Fix hit explosions not being cleaned up correctly when rewinding 2022-10-07 15:46:11 +09:00
Dean Herbert
6d14ccb8e0 Make special key slightly wider 2022-10-07 15:45:35 +09:00
Dean Herbert
e4e4c1b661 Add very temporary mania judgement display for argon skin 2022-10-07 15:45:35 +09:00
Dean Herbert
b95743092d Add argon hit explosion 2022-10-07 15:45:35 +09:00
Dean Herbert
258c935574 Remove key area background (the column background is enough to work well) 2022-10-07 15:45:35 +09:00
Dean Herbert
f3e3ee81cb Add column and stage background to argon skin 2022-10-07 15:45:35 +09:00
Dean Herbert
59bbbf1c08 Improve colours and hit metrics on key area 2022-10-07 15:45:35 +09:00
Dean Herbert
a543222a2b Add ability to pad stage vertically 2022-10-07 15:45:35 +09:00
Dean Herbert
4cb07b8839 Specify column widths for argon 2022-10-07 15:45:35 +09:00
Dean Herbert
6c0923ec1a Add argon hold note pieces 2022-10-07 15:45:35 +09:00
Dean Herbert
a10f9ebfa5 Update argon colours to roughly match design spec 2022-10-07 15:45:35 +09:00
Dean Herbert
c1cb62cc35 Add basic argon note piece 2022-10-07 15:45:35 +09:00
Dean Herbert
6f8533ef6b Remove pointless colour specifications in test scenes 2022-10-07 15:45:35 +09:00
Dean Herbert
f1ea61b1a2 Remove unused colour code 2022-10-07 15:24:37 +09:00
Dean Herbert
9a92ff1681 Fix SourceChanged unbind directionality and add null check 2022-10-07 15:24:37 +09:00
Dean Herbert
dee01abab1 Add method to get stage from column index 2022-10-07 15:24:37 +09:00
Dean Herbert
eea3d5adb8 Standardise column index naming and xmldoc 2022-10-07 15:24:36 +09:00
Dean Herbert
13e0a59f70 Add note about why LegacyManiaSkinConfigurationLookup exist 2022-10-07 15:24:36 +09:00
Dean Herbert
0d21c0e49c Remove StageDefinition from configuration lookups
I added this for future usage, but it turns out I can get the
definitions directly from `ManiaBeatmap`.
2022-10-07 15:24:36 +09:00
Dean Herbert
4a127f5d81 Fix classic skin colours sourcing from triangles defaults 2022-10-07 15:24:36 +09:00
Dean Herbert
6b79f16461 Make Column.AccentColour bindable 2022-10-07 15:24:36 +09:00
Dean Herbert
532d101080 Remove unused class 2022-10-07 15:24:36 +09:00
Dean Herbert
276395f1af Fix column colour not updating on skin change 2022-10-07 15:24:36 +09:00
Dean Herbert
3947011baf Fix regression in legacy dual stage handling logic 2022-10-07 15:24:36 +09:00
Dean Herbert
2ae1aef0be Move column initialisation to ctor and fix remaining tests 2022-10-07 15:24:36 +09:00
Dean Herbert
5fe9b953a5 Add back triangles column colours via a transformer 2022-10-07 15:24:36 +09:00
Dean Herbert
1a0b953846 Remove unnecessary Beatmap parameter in ManiaLegacySkinTransformer 2022-10-07 15:24:36 +09:00
Dean Herbert
5c48d8931a Add StageDefinition to ManiaSkinConfigurationLookup and make column background colour lookup work 2022-10-07 15:24:36 +09:00
Dean Herbert
9c979044dc Move AccentColour assignment to inside Column 2022-10-07 15:24:36 +09:00
Dean Herbert
46c3cfe54d Remove StageDefinition flow in ManiaSkinComponent 2022-10-07 15:24:36 +09:00
Dean Herbert
7796a4c109 Cache StageDefinition for consumption (and remove ColumnType) 2022-10-07 15:24:36 +09:00
Dean Herbert
df3ad618e1 Move ColumnType to constructor 2022-10-07 15:24:36 +09:00
Dean Herbert
e0c66dbdbc
Merge pull request #20566 from smoogipoo/adjust-flashlight
Adjust flashlight to more closely match classic scaling
2022-10-07 15:23:42 +09:00
Dan Balasescu
4e6047f23d
Merge pull request #20571 from peppy/argon-mania
Add "argon" key area for osu!mania
2022-10-07 15:19:18 +09:00