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

291 Commits

Author SHA1 Message Date
Dan Balasescu
9415fe4446
Add mania hold note body + combo break judgement 2023-10-09 09:47:00 +09:00
Dan Balasescu
b2d9c95441
Remove HoldNoteTickJudgement 2023-10-09 09:31:45 +09:00
Dean Herbert
9949480ccd Add minor edge smoothing to fix flickering of barlines
In most cases.

Closes https://github.com/ppy/osu/issues/15184.
2023-09-26 17:06:52 +09:00
Dean Herbert
5150c5a643 Adjust osu!mania "major" barlines to be less visually distracting
Applies to both "triangles" and "argon" skins.
2023-09-26 17:06:27 +09:00
Dean Herbert
6c95b88589 Add debug output for skin configuration lookups
We've struggle with debugging these over the years so I think this was
worth a couple of hours of work.

Example of osu! lookups:

```log
[runtime] 2023-09-06 08:38:30 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: Vickeblanka - Lucky Ending (TV Size) (tears_) [Normal] } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: SpinnerFrequencyModulate) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: SpinnerFrequencyModulate) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: osu.Game.Skinning.ResourceStoreBackedSkin }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-osu.Game.Skinning.ResourceStoreBackedSkin.GetConfig(lookup: SpinnerFrequencyModulate) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: TrianglesSkin{ Name: osu! "triangles" (2017) } }.GetConfig(lookup: SpinnerFrequencyModulate)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-TrianglesSkin{ Name: osu! "triangles" (2017) }.GetConfig(lookup: SpinnerFrequencyModulate) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]:
[runtime] 2023-09-06 08:38:30 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: Vickeblanka - Lucky Ending (TV Size) (tears_) [Normal] } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: ScorePrefix) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: ScorePrefix) 🟢
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: osu.Game.Skinning.ResourceStoreBackedSkin }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-osu.Game.Skinning.ResourceStoreBackedSkin.GetConfig(lookup: ScorePrefix) 🔴
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: TrianglesSkin{ Name: osu! "triangles" (2017) } }.GetConfig(lookup: ScorePrefix)
[runtime] 2023-09-06 08:38:30 [verbose]: |-|-|-TrianglesSkin{ Name: osu! "triangles" (2017) }.GetConfig(lookup: ScorePrefix) 🔴
```

Example of osu!mania lookups:

```log
[runtime] 2023-09-06 08:28:34 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4]) 🔴
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnWidth col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnWidth col:0 totalcols:4]) 🟢
[runtime] 2023-09-06 08:28:34 [verbose]:
[runtime] 2023-09-06 08:28:34 [verbose]: BeatmapSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacyBeatmapSkin{ Name: antiPLUR - Runengon (Raveille) [Easy] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-RulesetSkinProvidingContainer.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: LegacySkin{ Name: Test Skin [test-skin] } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-LegacySkin{ Name: Test Skin [test-skin] }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4]) 🔴
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-SkinProvidingContainer+DisableableSkinSource{ skin: SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } } }.GetConfig(lookup: [ManiaSkinConfigurationLookup lookup:ColumnSpacing col:0])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-SkinTransformer{ Skin: DefaultLegacySkin{ Name: osu! "classic" (2013) } }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4])
[runtime] 2023-09-06 08:28:34 [verbose]: |-|-|-|-DefaultLegacySkin{ Name: osu! "classic" (2013) }.GetConfig(lookup: [LegacyManiaSkinConfigurationLookup lookup:ColumnSpacing col:0 totalcols:4]) 🟢
[runtime] 2023-09-06 08:28:34 [verbose]:

```
2023-09-06 18:03:40 +09:00
Dan Balasescu
6a7b0786c9 Add barline pooling for mania 2023-08-15 13:33:49 +09:00
Maksim Kan
f70342bd67 Fix Triangle skin colors with Dual Stage mod 2023-06-17 10:12:26 +03:00
Dean Herbert
cdd931633d
Change 3K middle key to "special" purple colour
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-06-07 12:10:30 +09:00
Dean Herbert
7a1766e378 Update argon osu!mania column colours in line with latest proposal
Matches https://github.com/ppy/osu/discussions/21996#discussioncomment-5516872.
2023-06-06 16:42:20 +09:00
Bartłomiej Dach
2b525b626c
Revert to previous conditional style 2023-03-28 06:22:00 +02:00
Bartłomiej Dach
c54934cb45
Fix hit lighting misalignment on argon skin with upscroll 2023-03-27 18:15:01 +02:00
Bartłomiej Dach
b5e04791e9
Merge branch 'master' into mania-shadow-icon-changes 2023-03-20 19:33:52 +01:00
Bartłomiej Dach
fe91f85f6f
Reuse colour constants in fallback path 2023-03-20 18:16:33 +01:00
Dean Herbert
d87f0557ce Update colours for 3k to not use double-purples 2023-03-15 17:18:45 +09:00
Dean Herbert
f40a4b591f Adjust animation length and colouring of hitting layer 2023-03-14 18:14:29 +09:00
Dean Herbert
300d81c46b Add hitting layer to fix hit lighting not being applied to tail piece
Taken from https://github.com/ppy/osu/pull/22820#issuecomment-1462626898.
2023-03-14 17:29:19 +09:00
Bartłomiej Dach
6b2a70b112
Remove unused fields 2023-03-09 19:14:08 +01:00
Dean Herbert
08b88ed639 Adjust hold note head icon to be more centered 2023-03-09 20:46:24 +09:00
Dean Herbert
e12ab165b8 Adjust colours a bit to make hold note bodies more accented 2023-03-09 20:46:24 +09:00
Dean Herbert
2ad531f263 Adjust argon note shadows and body to be closer in line with new design proposal 2023-03-09 20:27:58 +09:00
Dean Herbert
526eeedec2 Adjust explosion and hit target to not include shadow portion in height calculation 2023-03-09 20:27:43 +09:00
Dean Herbert
bfc0b946fb Remove additive blending from argon body piece 2023-03-09 20:26:35 +09:00
Dean Herbert
030742c648 Use different icon style on hold note heads 2023-03-09 19:02:45 +09:00
Dean Herbert
e246784867 Fix dual stage column colours not being looked up correctly 2023-03-09 18:25:30 +09:00
Dean Herbert
b8e87e3a08 Update osu!mania argon colours to match new proposal 2023-03-08 20:03:06 +09:00
Dean Herbert
36058b3da2 Fix upwards scroll direction not working with recent hold note display changes 2023-03-03 18:03:06 +09:00
Dean Herbert
bd8c58dc62 Adjust applied body ratio to ROUGHLY match stable 2023-02-14 14:34:12 +09:00
Dean Herbert
b1d2a433f8 Apply second attempt at fixing long note bodies 2023-02-10 20:36:58 +09:00
Dean Herbert
5091c50003 Change scroll direction logic to not interfere with scale 2023-02-10 19:18:17 +09:00
Dean Herbert
61c968d7f8 Revert completely incorrect change 2023-02-10 19:18:00 +09:00
itsMapleLeaf
ccd68a6263 optimize imports 2023-02-01 19:22:28 -06:00
itsMapleLeaf
a8ce0a3278 now without the weird hacks 2023-02-01 18:50:38 -06:00
itsMapleLeaf
0d6e757baf Merge branch 'argon-mania-hold-tail-no-sprite' of https://github.com/itsMapleLeaf/osu into argon-mania-hold-tail-no-sprite 2023-01-31 19:53:03 -06:00
itsMapleLeaf
fe175e72a9 make upscroll make sense 2023-01-31 19:52:58 -06:00
itsMapleLeaf
ff26effa29 rounded tail line 2023-01-31 19:36:49 -06:00
Dean Herbert
c428565e05
Merge branch 'master' into argon-mania-hold-tail-no-sprite 2023-01-31 19:05:52 +09:00
itsMapleLeaf
c81bac5f31 braces 2023-01-31 02:23:25 -06:00
itsMapleLeaf
e77b0b9fcc use dark tail with shadow matching the hold head 2023-01-31 02:22:40 -06:00
itsMapleLeaf
9e7f9c86ca flat hold tail 2023-01-30 11:14:29 -06:00
Bartłomiej Dach
34aa8b872e
Mention stable weirdness next to constant 2023-01-25 19:02:38 +01:00
Dean Herbert
598c6fcbad Add basic support for stupidly long hold note skin textures 2023-01-25 14:43:46 +09:00
itsMapleLeaf
132417b4e4 fix braces 2023-01-24 22:36:13 -06:00
itsMapleLeaf
5f037ac1e9 comment not useful 2023-01-24 22:24:21 -06:00
itsMapleLeaf
9a053f114e remove sprite 2023-01-23 01:50:50 -06:00
itsMapleLeaf
338a14ff69 new mania hold tail 2023-01-23 01:01:45 -06:00
Dean Herbert
5e9fb1063a Move judgement text creation to base class and tidy things up 2022-12-24 12:22:36 +08:00
Dean Herbert
03603f8b54 Don't show great or higher judgements when using argon "pro" skin 2022-12-24 03:35:44 +08:00
Dean Herbert
727ac00f6d Combine base class for JudgementPiece 2022-12-24 03:32:13 +08:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Dean Herbert
b404b87f68 Realign white line on argon hold note ends to match hit target 2022-11-21 18:26:53 +09:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b Rename ISkinComponent to ISkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
a6165ea78a Apply nullability to osu!mania skinning classes 2022-11-09 13:58:58 +09:00
Dean Herbert
8bf4ca4b53 Add legacy skin fallback when beatmap skin is providing resources 2022-10-12 17:47:20 +09:00
Dean Herbert
0b5f8e1c93 Remove duplicated colour in osu!mania argon skin column colouring
There will probably be more change to colours, but let's just fix this
for now.
2022-10-10 13:12:30 +09:00
Dean Herbert
588713497d Attempt to make hold notes more legible at low background dims 2022-10-07 20:43:26 +09:00
Dean Herbert
589b764b77 Final tweaks because I don't know when to stop 2022-10-07 20:30:38 +09:00
Dean Herbert
d5490523ea Adjust hold notes further 2022-10-07 20:05:13 +09:00
Dean Herbert
8101eea50d Fix first glow of key area elements not working due to missing type 2022-10-07 20:05:13 +09:00
Dean Herbert
c518fbf44a Adjust argon hold bodies to better define away from the stage background 2022-10-07 20:05:13 +09:00
Dean Herbert
08c3f3ae6d Adjust lighting and timing of key area in general 2022-10-07 20:05:13 +09:00
Dean Herbert
551b7f0d1c Fix corner radius visible below hit target line 2022-10-07 20:05:13 +09:00
Dean Herbert
e4657a7a3d Fix argon key area lighting being hidden by other columns in one direction 2022-10-07 20:05:13 +09:00
Dean Herbert
12e9686092 Increase column spacing 2022-10-07 20:05:13 +09:00
Dean Herbert
f9b4f491a6 Increase overall corner radius slightly 2022-10-07 20:05:13 +09:00
Dean Herbert
58eaa18725 Add transparency to column backgrounds 2022-10-07 20:05:13 +09:00
Dan Balasescu
721189b23a
Merge branch 'master' into argon-mania-note 2022-10-07 17:34:11 +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
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
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
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
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
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
395ab58892 Attempt to fix code style infractions 2022-10-04 16:17:38 +09:00
Dean Herbert
345430ab39 Fix argon hit target area not being aligned correctly 2022-10-04 16:16:09 +09:00
Dean Herbert
1ffa0afafc Tweak visuals and fix up code quality 2022-10-04 16:05:36 +09:00
Dean Herbert
36e2f5c512 Add argon hit target pieces 2022-10-04 14:56:46 +09:00
Dean Herbert
d32eb64561 Adjust colour application to stay around a bit longer 2022-10-04 14:56:46 +09:00
Dean Herbert
4718f4ac24 Add second icon and improve glow effect 2022-10-04 14:56:46 +09:00
Dean Herbert
83e7cc1e09 Add argon key area 2022-10-04 14:56:46 +09:00
Dean Herbert
97207c11f5 Add base transformer for osu!mania argon skin 2022-10-04 14:56:46 +09:00
Dean Herbert
a215d009fe Update Remove/RemoveRange/RemoveAll calls in line with framework changes 2022-08-29 15:57:40 +09:00