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
5aebbac6c5
Fix osu!mania hold note animations not correctly re-applying after rewind
...
There's early exit logic in `OnPressed`/`OnReleased` for the sake of
keeping order correct, but this doesn't account for the fact that
`DrawableHitObject` resets all animations when the hit state changes.
A bit of an ugly workaround, but seems to work as expected.
2023-03-14 18:15:19 +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
ed3ff62e4f
Add note about why bodyPiece sizing is done as it is
...
I think we're going to have to change this as it's quite limiting in
what you can do with osu!mania skin implementation, but for now I want
to leave a note as to why this is done, because each time I have to
trial and error check what breaks when adjusting it.
2023-03-09 20:26:49 +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
da8ab7143b
Merge branch 'master' into maximum-judgement-offset-in-hit-object
2023-02-15 14:48:15 +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
Dean Herbert
c691a0d3af
Merge branch 'master' into sheared_slider_implementation_clean_ii
2023-02-06 17:49:33 +09:00
mk56-spn
3f0ce75bf5
Rename NormalSliderBar.cs to RoundedSliderBar.cs
2023-02-02 17:24:45 +01:00
Dean Herbert
8a39afd293
Merge pull request #22402 from itsMapleLeaf/argon-mania-hold-tail-no-sprite
...
Improve argon osu!mania hold notes visuals and fix reverse scroll direction looking wrong
2023-02-02 14:39:23 +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
Dean Herbert
74ab036f3e
Refactor SkinnableSound.Samples to be non-nullable
2023-01-27 19:32:30 +09:00
mk56-spn
3988131475
Rename OsuSliderBar.cs as NormalSliderBar.cs
2023-01-26 12:12:56 +01:00
Dan Balasescu
5f4dd19b49
Merge pull request #22389 from peppy/mania-long-note-wang
...
Add basic support for stupidly long hold note skin textures
2023-01-26 07:41:27 +09: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
Dean Herbert
a966d6c330
Merge pull request #18402 from ggliv/mod-accuracy-challenge
...
Add accuracy challenge mod
2023-01-24 16:00:55 +09: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
ekrctb
11e1b22bf5
Move MaximumJudgementOffset to HitObject
...
We want to access this property for computing lifetime
2023-01-19 21:23:55 +09:00
Dean Herbert
88e6db1bea
Merge pull request #21725 from Mogiiii/mania-hidden-configuration
...
Add mania hidden & FadeIn mod configuration
2023-01-18 18:19:14 +09:00
Dean Herbert
70cb23bbc9
Merge branch 'master' into mod-accuracy-challenge
2023-01-17 16:46:54 +09:00
Dean Herbert
eb0f30c641
Use scroll speed localisation in one more usage
2023-01-16 13:28:45 +09:00
Dean Herbert
d19b35bd5f
Rename ambiguous translation keys
2023-01-16 13:18:49 +09:00
ansel
6f84641596
Localise osu!mania settings
2023-01-15 23:30:20 +03:00
Dylan Nantz
e23c565c84
code quality
2023-01-11 14:28:11 -05:00
Dylan Nantz
1f4e0303f7
add mania FadeIn mod configuration
2023-01-11 14:13:29 -05:00
Dan Balasescu
f03677f394
Remove HP drain from mania
2023-01-11 13:01:18 +09:00
Dean Herbert
efded323e4
Rename variables and avoid the need for a property
2023-01-09 16:49:38 +09:00
Dylan Nantz
28bd005c21
Merge branch 'master' of https://github.com/ppy/osu into mania-hidden-configuration
2023-01-06 11:39:50 -05:00
Dylan Nantz
b8fbd68e32
reduce mania hidden mod precision
2023-01-06 11:39:41 -05:00
Dean Herbert
98483d2a1b
Merge pull request #21638 from Mogiiii/touchscreen-control-disable-mouse
...
Disable touchscreen controls responding to mouse in scrolling gamemodes
2023-01-06 20:39:09 +08: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
Berkan Diler
08d2fbeb8e
Use new ArgumentNullException.ThrowIfNull throw-helper API
2022-12-22 21:27:59 +01:00
Bartłomiej Dach
0a49c8c5d6
Add missing unsubscriptions in multiple mania components
2022-12-21 20:22:40 +01:00
Dylan Nantz
4a1a023f9e
Code quality improvements
2022-12-20 13:33:33 -05:00
Dylan Nantz
42dbb0bfd0
fix formatting
2022-12-19 19:24:38 -05:00
Dylan Nantz
c200e77994
Add mania hidden mod configuration
2022-12-19 18:31:28 -05:00
Dean Herbert
d6cae991da
Update netstandard2.1 references to net6.0
2022-12-16 17:16:13 +09:00
Dylan Nantz
ee945c9b58
disable mouse input to touchscreen controls
2022-12-14 10:34:21 -05:00
Dan Balasescu
7bc8908ca9
Partial everything
2022-11-27 00:00:27 +09:00
Dean Herbert
57723107dd
Fix osu!mania hold notes occasionally getting in a visually incorrect hit state
...
To correctly end a mania hold note, `endHold()` needs to be called. This
was not happening in a very specific scenario:
- The hold note's head is not hit
- The user pressed the column's key within the hold note's tail's window,
but does so to hit the next object (a note in proximity to the hold note's tail).
- The hit policy forces a miss on the hold note, but `endHold()` is not called
- `CheckForResult` is not called after this point due to `Judged` being `true`.
Closes #21311 .
2022-11-22 16:15:34 +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
Dan Balasescu
37407293aa
Adjust target and hold off mod multipliers
2022-11-01 17:57:20 +09:00
ekrctb
92ab39f5c2
Fix hold note disappear instantly
2022-10-25 19:16:23 +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
b444f0fd0b
Merge pull request #20714 from frenzibyte/improve-flashlight-on-break
...
Improve flashlight display on break periods
2022-10-12 13:10:12 +09:00
Dean Herbert
a5948e7680
Merge pull request #20704 from ekrctb/scrolling-drag-box
...
Anchor editor drag box on time (catch, mania)
2022-10-12 11:48:05 +09:00
Salman Ahmed
84fdd2e107
Improve flashlight display on break periods
2022-10-11 17:16:57 +03:00
Dan Balasescu
ac2c986ff5
Merge pull request #20679 from peppy/remove-duplicated-colour
...
Remove duplicated colour in osu!mania argon skin column colouring
2022-10-11 17:44:34 +09:00
Dean Herbert
f41b79688f
Avoid casting by accepting all Playfields but throwing on a bad choice
2022-10-11 16:54:41 +09:00
Dean Herbert
f060e6a780
Implement hold "sliding" samples in osu!mania
2022-10-11 16:31:37 +09:00
ekrctb
6ab29a62d0
Anchor drag box on time (catch, mania)
...
Not done for taiko because I cannot figure out how it should work with the overlapping scroll algorithm.
2022-10-11 14:23:17 +09:00
Dan Balasescu
ed2b39a220
Remove whitespace
2022-10-11 13:53:18 +09:00
Natelytle
cc54fc5c1b
rename method to reflect being a method
2022-10-10 13:52:01 -04:00
Natelytle
430eb44446
slight formatting
2022-10-10 13:45:16 -04:00
Natelytle
32adc1ec14
Fix division by 0
2022-10-10 13:36:52 -04: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
Dan Balasescu
15a7fb044d
Merge pull request #20600 from peppy/fix-mania-rewinding
...
Fix osu!mania key / stage lighting / explosions not working well with rewind
2022-10-07 21:42:39 +09:00
Dean Herbert
e1e12f41e9
Add more comprehensive inline comment
2022-10-07 21:00:11 +09:00
Dan Balasescu
d63f196626
Merge branch 'master' into fix-mania-rewinding
2022-10-07 20:45:56 +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
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
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
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
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
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
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
ekrctb
ea4dbc8c0f
Fix mania hold note head disappears
2022-10-06 19:46:10 +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
ekrctb
15d159a97e
Fix tests
2022-10-04 16:10:18 +09:00
Dean Herbert
1ffa0afafc
Tweak visuals and fix up code quality
2022-10-04 16:05:36 +09:00
ekrctb
2aa4d21c75
Remove code that is not needed anymore
2022-10-04 15:17:14 +09:00
Dean Herbert
36e2f5c512
Add argon hit target pieces
2022-10-04 14:56:46 +09:00
