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

2571 Commits

Author SHA1 Message Date
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
Bartłomiej Dach
92c2320689
Merge pull request #23776 from peppy/fix-scroll-time-decimal
Fix osu!mania scroll speed milliseconds having too much precision
2023-06-06 22:34:08 +02:00
Dean Herbert
6b18f2f2bb Fix osu!mania scroll speed milliseconds having too much precision
Closes #23750.
2023-06-06 21:43:56 +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
Dean Herbert
b8d9c9ff93 Move ApplyGameWideClock to extension method
I don't see an issue with applying this workaround to more places, even
though it is a workaround, because it marks each usage very clearly. If
we design a better solution in the future it should be easy to replace
the usages.
2023-06-06 16:07:50 +09:00
Bartłomiej Dach
331e90f720
Merge branch 'master' into tidy-results-grid-usage 2023-06-03 19:45:23 +02:00
Dan Balasescu
e402c6d2b4 Write max combo attribute from base class 2023-06-02 21:53:25 +09:00
Bartłomiej Dach
4daf1fcb7d
Merge pull request #23721 from peppy/fix-mania-hold-not-early-hit
Fix osu!mania hold notes snapping to judgement area too early on early hits
2023-06-01 21:57:36 +02:00
Dean Herbert
00bf79d51f
Merge pull request #23691 from smoogipoo/mania-scroll-speed
Replace mania scroll "time" with scroll "speed"
2023-06-01 17:23:27 +09:00
Dean Herbert
98f35f7481 Fix osu!mania hold notes snapping to judgement area too early on early hits
Closes https://github.com/ppy/osu/issues/23515.
2023-06-01 16:06:35 +09:00
Dean Herbert
985604fab5 Return StatisticItems rather than StatisticRows from ruleset
There were no usages of more than one column being provided per row, so
it seemed like unnecessarily complexity. I'm currently trying to reduce
complexity so we can improve the layout of the results screen, which
currently has up to three levels of nested `GridContainer`s.

Of note, I can't add backwards compatibility because the method
signature has not changed in `Ruleset` (only the return type). If we do
want to keep compatibility with other rulesets, we could designate a new
name for the updated method.
2023-06-01 14:35:15 +09:00
Dan Balasescu
b456c36f64 Migrate in InitialiseDefaults() 2023-05-30 17:27:48 +09:00
Dan Balasescu
1c199b83e3 Replace mania scroll "time" with scroll "speed" 2023-05-29 21:22:23 +09:00
Dan Balasescu
fee3d43596 Merge branch 'master' into scorev2 2023-05-23 19:07:54 +09:00
Dan Balasescu
30a296bd09 Rename parameters 2023-05-19 17:27:02 +09:00
Dan Balasescu
d74bf2a096 Refactor for safety 2023-05-19 14:37:26 +09:00
Dan Balasescu
2ae34530f7 Avoid NaN values during ApplyBeatmap processing() 2023-05-19 14:14:34 +09:00
Dan Balasescu
7cbf48ffcf Fix TestSceneScoring and incorrect combo calculations 2023-05-19 14:09:19 +09:00
Dan Balasescu
8b56a3f87d Remove ClassicScoreMultiplier and DefaultScoreProcessor 2023-05-19 12:24:52 +09:00
Dean Herbert
f443cfb93e Move blueprint validity conditions to allow more correct external usage of EndPlacement
Until now, these were haphazardly enforce inline in blueprint
implementations. The only thing stopping complete breakage is that
`EndPlacement` wasn't called (too much) from outside the blueprint,
leaving them responsible for their own placement.

By moving this conditional out of the provided paramters to
`EndPlacement`, it allows more flexible usage of that method externally.
Coming in a future PR.
2023-05-12 16:02:22 +09:00
Dan Balasescu
a7b623f52a Reimplement classic scoring mode 2023-05-09 20:21:38 +09:00
Dan Balasescu
3c3c812ed6 Initial implementation of ScoreV2 2023-05-09 19:33:33 +09:00
Bartłomiej Dach
efc4df95eb
Merge pull request #23429 from peppy/fix-incorrect-mania-description-keys
Fix incorrect special style description text
2023-05-09 07:04:57 +02:00
Bartłomiej Dach
0a47ffcbdd
Match generally used casing
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2023-05-09 07:03:13 +02:00
Bartłomiej Dach
1ff1730948
Remove no-longer-correct remark 2023-05-08 22:35:41 +02:00
Bartłomiej Dach
3f45948664
Merge branch 'master' into fix-mania-head-note-animation 2023-05-08 22:23:01 +02:00
Dean Herbert
27c10cbdb7 Remove clamping of sizingContainer in DrawableHoldNote to fix head note alignment 2023-05-08 18:14:07 +09:00
Dean Herbert
814f0b3fed Add back early return in OnReleased for safety 2023-05-08 15:43:11 +09:00
Dean Herbert
85d0c56cd2 Fix incorrect special style description text
Closes https://github.com/ppy/osu/issues/23428.
2023-05-08 13:00:45 +09:00
Dean Herbert
6a59ded1ba Move logic to Update instead 2023-05-03 15:18:37 +09:00
Dean Herbert
4013cdcfa8 Merge branch 'master' into mania-fix-hold-note-rewind 2023-05-03 15:04:59 +09:00
OliBomby
e7a478ce9c Update convert-samples-expected-conversion.json 2023-04-30 16:04:03 +02:00
OliBomby
d97daee96b remove all non-test usage of SampleControlPoint 2023-04-26 13:55:39 +02:00
OliBomby
39d9f0c3f5 removing using 2023-04-26 13:22:13 +02:00
OliBomby
6c70948681 Remove IContext & add IHasGenerateTicks 2023-04-26 13:10:57 +02:00
OliBomby
e4b64bdc3e clean up code stuff 2023-04-25 19:06:29 +02:00
OliBomby
ea1e6e9798 Add LegacyContext 2023-04-25 12:12:46 +02:00
OliBomby
a4c6850ab2 made the SampleControlPoint and DifficultyControlPoint obsolete 2023-04-25 11:34:09 +02:00
Dan Balasescu
ad51f880e0 Remove overrides on DC/NC mods 2023-04-10 17:49:29 +09:00
Dan Balasescu
15f6bc155e Add progressive score multiplier for HT 2023-04-10 13:35:48 +09:00
Dan Balasescu
c923482976 Add progressive score multiplier for DT 2023-04-10 13:31:48 +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
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
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
Dan Balasescu
1890a66b28
Merge pull request #20509 from o-dasher/cleanup-setting-sources
Removes unnecessary setting sources specifications
2022-09-28 17:55:42 +09:00
Dan Balasescu
cbed268ac9
Merge pull request #20510 from sw1tchbl4d3r/high_bpm_judgements
Clamp `LifetimeStart` of `HitObject`s to their judgement windows
2022-09-28 17:49:35 +09:00
sw1tchbl4d3
0cffbb7562 Clamp LifetimeStart of HitObject's to their judgement windows 2022-09-27 16:54:24 +02:00
o-dasher
f3e25eacad Removes unnecessary setting sources specifications 2022-09-27 09:25:58 -04:00
o-dasher
537796c3a1 Cleanup mod bindings 2022-09-25 15:49:22 -04:00
Dean Herbert
c7f8f948b9 Rename CreateLegacySkinProvider to CreateSkinTransformer and apply to all skins 2022-09-15 20:18:10 +09:00
Dean Herbert
91c415f29b Fix nullability oversight in ManiaRulesetConfigManager 2022-09-12 16:58:20 +09:00
andy840119
3d7367a842 Move the CreateConvertibleReplayFrame() into the base ruleset class for avoid api breaking change in the customized ruleset. 2022-09-10 11:07:23 +08:00
andy840119
ec86700f29 Add the nullable disable annotation back becuse it will cause the api broken if remove the nullable disable annotation in the mania ruleset. 2022-09-10 10:45:51 +08:00
andy840119
e62999fb16 Merge branch 'master' of https://github.com/ppy/osu into remove-the-nullable-disable-in-the-ruleset
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Osu/OsuRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
#	osu.Game/Rulesets/Ruleset.cs
2022-09-10 10:40:12 +08:00
Dean Herbert
f0fdfb13c3
Merge pull request #20190 from cdwcgt/mania-fixed-speed-show
Show fixed speed in mania scroll speed settings
2022-09-08 23:00:10 +09:00
cdwcgt
09fa24c563
new display format 2022-09-08 19:12:54 +08:00
cdwcgt
f0850c42e5
fix typo
`ManiaScorllSlider` -> `ManiaScrollSlider`
2022-09-08 18:16:23 +09:00
cdwcgt
53219ae4e7
show fixed speed in mania scroll speed settings 2022-09-08 16:59:48 +08:00
Salman Ahmed
ff4a051c05
Merge branch 'master' into remove-dispose-updates 2022-09-03 16:14:50 +03:00
Dan Balasescu
9645bfe708 Bump difficulty calculator versions 2022-09-02 16:27:25 +09:00
Dean Herbert
6a35b233e5 Merge branch 'master' into remove-dispose-updates 2022-09-01 23:03:19 +09:00
Dean Herbert
a215d009fe Update Remove/RemoveRange/RemoveAll calls in line with framework changes 2022-08-29 15:57:40 +09:00
Dean Herbert
90b9c02ac6 Remove "internal" identifier as unnecessary 2022-08-29 14:01:15 +09:00
Dean Herbert
f5710d8000 Add ruleset API versioning 2022-08-22 16:35:08 +09:00
Dean Herbert
d199b3b100 Update GetVariantName to also support localisation 2022-08-22 14:51:00 +09:00
naoei
29ef1c8db8 Check if StatisticItem.Name is null or empty 2022-08-20 21:48:53 -04:00
Nao
189a407cb1
Merge branch 'master' into ruleset-localization 2022-08-20 21:39:10 -04:00
Dan Balasescu
4627e4f53b
Merge pull request #19120 from molneya/mania-note-order-fix
Fix mania star rating varying by order of notes in a chord
2022-08-17 20:39:52 +09:00
Dan Balasescu
f381bc9115 Add explanatory comment 2022-08-17 19:03:48 +09:00
Dean Herbert
ee153a345c Add a few more overlooked beatmap save states on setup screen modifications 2022-08-16 16:31:56 +09:00
63411
b33e0f5e1c update comment and deltaTime check 2022-08-16 11:03:18 +08:00
Dan Balasescu
5f70ee3ed7
Merge branch 'master' into mania-note-order-fix 2022-08-15 23:44:02 +09:00
Nao
c940f5abcb
Merge branch 'master' into ruleset-localization 2022-08-14 15:17:44 -04:00
naoei
45e9eda9e7 Localise hit result name 2022-08-14 14:57:02 -04:00
naoei
18ce784ae0 Allow StatisticItem's name param to be nullable 2022-08-14 14:51:35 -04:00
Dean Herbert
e5e9841652 Apply multiple other mod debuffs as decided in pull request discussion 2022-08-12 18:58:09 +09:00
naoei
3e38baca3c Change ruleset mod description types 2022-08-10 16:09:11 -04:00
Dan Balasescu
a52fa8eb8b
Rename const 2022-08-09 13:20:20 +09:00
Dean Herbert
1f4b87d233 Adjust visuals of osu!mania barlines to be less present
Roughly matches the new design. Metrics adjusted to fit with the existing design.

Closes #19611 maybe?
2022-08-08 17:39:14 +09:00
Dan Balasescu
b4e55f7309 Apply IRenderer changes 2022-08-02 19:50:57 +09:00
為什麼
4120c20968 Remove the nullable disable annotation in the Mania ruleset. 2022-07-27 22:24:02 +08:00
Dean Herbert
aca19a005e Add versioning to difficulty calculators 2022-07-21 18:15:25 +09:00
Salman Ahmed
1051009827 Change bindable properties in all HitObjects to be lazily initialised 2022-07-19 05:39:10 +03:00
63411
4fdbf3ff24 individualStrain should be the hardest individualStrain column for notes in a chord 2022-07-14 15:07:58 +08:00
為什麼
1725a76fa0 Remove the nullable disable annotation for all rulesets. 2022-07-10 10:15:27 +08:00
為什麼
857377e145 Move CreateConvertibleReplayFrame() into legacy ruleset interface because technically only legacy ruleset use it to convert the legacy frame.
But seems some of the customized ruleset use it for save the replay frame.
2022-07-10 10:15:27 +08:00
andy840119
a7bcc32cc2 Remove the nullable disable annotation in the mania ruleset. 2022-07-03 21:04:39 +08:00
andy840119
0a1543c6e8 Use AsNonNull() instead. 2022-07-02 19:48:32 +08:00
andy840119
59c83a3423 Mark as non-null because next object in here will always has value. 2022-07-02 13:33:51 +08:00
andy840119
19721a9bbb Remove the nullable disable annotation and fix the breaking api. 2022-07-02 13:33:05 +08:00
molneya
11c7756670
Merge branch 'ppy:master' into mania-difficulty-refactor 2022-07-01 11:04:55 +00:00
Dan Balasescu
5cdf98b4dc Merge branch 'master' into accuracy-pp-curve 2022-06-29 16:48:11 +09:00
63411
2b42dfb9cb apply individualStrain decay only when a note appears in that column 2022-06-28 20:32:35 +08:00
Dan Balasescu
0fd2c010e5 Remove NRT disables from attributes classes 2022-06-27 16:07:15 +09:00
Dan Balasescu
0579780bb8 Add IBeatmapOnlineInfo parameter and use to extract more data 2022-06-27 16:07:15 +09:00
Dean Herbert
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
Bartłomiej Dach
26c5b59f6d
Replace usages of string.To{Lower,Upper}() 2022-06-24 11:57:45 +02:00
63411
9be13f88fd revert customAccuracy changes 2022-06-23 15:51:28 +08:00
63411
58d6fa4645 Reduce NoFail pp multiplier 2022-06-20 19:55:26 +08:00
63411
984634c580 Adjust customAccuracy formula slightly 2022-06-18 22:27:28 +08:00
63411
361a87412b Update comments 2022-06-18 12:20:47 +08:00
63411
451d4154f0 Fix code style 2022-06-18 00:45:34 +08:00
63411
e238bcc6c6 Remove unneeded attributes 2022-06-17 23:44:10 +08:00
63411
9fe7636138 Use accuracy for pp calculation 2022-06-17 23:38:22 +08:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Dan Balasescu
6d2a2ba7d6 Rename Position -> Index 2022-06-09 18:49:11 +09:00
Dan Balasescu
f0ef2e610e Merge branch 'master' into dho 2022-06-09 18:29:14 +09:00
Gabe Livengood
a805f78909
Merge branch 'master' into mod-accuracy-challenge 2022-06-06 12:11:47 -04:00
Dan Balasescu
a287fd73bb Write MaxCombo attribute for mania 2022-06-02 19:16:38 +09:00
Dan Balasescu
b1ffffc1ac Calculate true combo value in ManiaDifficultyCalculator 2022-06-02 19:16:31 +09:00
apollo-dw
66a6467403 Pass object position to the object 2022-05-26 19:26:14 +01:00
apollo-dw
30b9e0e7ab Use object list size for object position 2022-05-24 16:30:25 +01:00
Gabe Livengood
252bacc8d4 revert more testing leftovers... 2022-05-24 10:56:31 -04:00
Gabe Livengood
dde0756bed add accuracy challenge mod 2022-05-24 10:23:44 -04:00
apollo-dw
26985ca8af Store hitobject history in the hitobject 2022-05-22 16:26:22 +01:00
Dean Herbert
5af7641e94 Add safety against playfield potentially not being available during mania note placement 2022-05-19 15:53:53 +09:00
Dean Herbert
f7e055dbfe Move mania note height offset application to a much more suitable location 2022-05-12 16:19:07 +09:00
Dean Herbert
c0abce918f Add enum to snap method as alternative to mutliple nested invocations 2022-05-12 16:19:07 +09:00
Dean Herbert
f6fc926f1a Add xmldoc and rename methods in IPositionSnapProvider for legibility 2022-05-05 15:58:21 +09:00
Dean Herbert
93db6c6bb0 Move FastRandom to LegacyRandom in osu.Game project 2022-04-28 17:47:32 +09:00
Dan Balasescu
b19e738315
Merge pull request #17913 from molneya/hold-addition-fix
Fix mania SR inflation for hold note releases in quick succession
2022-04-26 18:31:07 +09:00
63411
6cca56ab77 Move release_threshold to const 2022-04-23 10:46:12 +08:00
Salman Ahmed
61078910a6 Handle all skin component types explicitly 2022-04-23 03:34:05 +03:00
63411
8b55d3855a Use isOverlapping bool to determine holdAddition 2022-04-22 13:27:59 +08:00
63411
56bbfa58e5 Add missing absolute value of closestEndTime 2022-04-22 13:01:41 +08:00
63411
97b4a2a105 Use better initial value for closestEndTime 2022-04-22 12:59:00 +08:00
63411
574007c07a Optimise holdAddition calculation 2022-04-22 02:02:23 +08:00
63411
e7a149af6c Use curve for holdAddition validity cutoff 2022-04-21 23:05:20 +08:00
63411
a0a83fb51f Use closest endTime for holdAddition validity 2022-04-21 23:03:28 +08:00
Dean Herbert
0cac935939 Shorten class name of ModCreatedReplayUser 2022-03-31 11:34:23 +09:00
Dean Herbert
4b2c01a8c1 Bring all mod implementations up-to-date 2022-03-29 16:59:03 +09:00
Dean Herbert
d2d88015e3 Update all cinema/autoplay mods to specify the system user ID 2022-03-28 22:22:56 +09:00
Dean Herbert
6fb06d69cc
Merge branch 'master' into pp-counter-alloc-reduction 2022-03-15 13:31:57 +09:00
Dan Balasescu
523f668c8c Remove unnecessary ctor argument 2022-03-15 12:37:39 +09:00
Dan Balasescu
daac933498 Remove unnecessary ctor arguments 2022-03-15 12:34:58 +09:00
Dan Balasescu
59d57a44d4 Prevent incorrect usages by hard-typing ctor type 2022-03-15 09:11:59 +09:00
Dan Balasescu
3fff7f4b7e Require ScoreProcessor to receive ruleset 2022-03-14 15:51:10 +09:00
Dan Balasescu
4a3e3aba65 Restructure PerformanceCalculator to not require ScoreInfo argument 2022-03-14 14:25:28 +09:00
Dan Balasescu
c36badab4b Add per-ruleset score multipliers for classic scoring 2022-03-10 10:26:09 +09:00
Dean Herbert
8bb07f83cd
Merge pull request #17054 from hlysine/mod-adaptive-speed
Implement Adaptive Speed mod
2022-03-09 17:56:34 +09:00
Dean Herbert
33862fc0db Centralise implementation of slider bars which display millisecond time values 2022-03-04 12:25:19 +09:00
Dean Herbert
abba49fd8f Update all usages of OsuSlider.TooltipText overrides to instead implement GetTooltipText 2022-03-04 12:16:05 +09:00
Henry Lin
c9b205afeb Add adaptive speed mod 2022-03-02 09:57:52 +08:00
Dean Herbert
a41e1c80f1 Show hit error on results screen
Leading up to implementation of "local offset", this feels like a good
thing to have visible first and foremost.
2022-02-28 19:11:06 +09:00
Dean Herbert
13b6cfb5ed
Merge pull request #16898 from smoogipoo/fix-mania-pp-score-multiplier
Fix mania PP calculator applying incorrect score multiplier
2022-02-17 19:21:08 +09:00
Dean Herbert
64360f2b37
Merge pull request #16891 from smoogipoo/fix-mania-hitwindow-attrib
Fix mania hit window attribute improperly considering rate-adjustment mods
2022-02-17 14:03:51 +09:00
Dan Balasescu
39a7bbdb9a Fix mania PP calculator applying incorrect score multiplier 2022-02-17 14:03:39 +09:00
Dean Herbert
7307e68e9c Revert "Merge pull request #16889 from smoogipoo/remove-mod-multiplier"
This reverts commit 252b945d3b, reversing
changes made to a1b39a96cf.
2022-02-17 13:26:12 +09:00
Dan Balasescu
0b37efc985 Add explanatory note 2022-02-16 20:07:58 +09:00
Dan Balasescu
a0ee86ddd2 Fix improperly considering rate adjustment mods 2022-02-16 19:51:42 +09:00
Dan Balasescu
1f9892802c
Merge pull request #16886 from peppy/clarify-parenthesis
Clarify ambiguous conditionals in `LegacyStageBackground`
2022-02-16 19:15:21 +09:00
Dan Balasescu
d4bf335fcc Use score multiplier attribute in ManiaPerformanceCalculator 2022-02-16 16:24:40 +09:00
Dean Herbert
f703828e1b Clarify ambiguous conditionals in LegacyStageBackground 2022-02-16 15:27:49 +09:00
Dan Balasescu
84e82ef5e4 Add XMLDocs to difficulty attribute properties 2022-02-16 14:09:19 +09:00
Henry Lin
ee6d4b2583 Move performance breakdown to the top to prevent re-ordering after watching replay 2022-02-05 21:39:01 +08:00
Henry Lin
0b1fef38af Use the playable beatmap provided in CreateStatisticsForScore 2022-02-05 21:36:34 +08:00
Henry Lin
440b674bb0 Add statistic item for mania & taiko 2022-02-05 21:30:35 +08:00
Henry Lin
f29301cd1e
Merge branch 'master' into display-performance-attributes 2022-02-05 16:59:46 +08:00
Dean Herbert
df9d99f5aa Merge branch 'master' into extended-statistics-without-replay 2022-02-03 18:59:48 +09:00
Bartłomiej Dach
82f9ad63f5
Fix flashlight size multiplier printing with too many decimal digits 2022-02-02 20:41:25 +01:00
Dean Herbert
19eb9ad8a7 Reorder StatisticsItem constructor to make a touch more sense 2022-02-02 23:02:38 +09:00
Henry Lin
6a482827fe Fix weird line breaking 2022-02-02 17:23:03 +08:00
Henry Lin
c5c4c85006 Lazily create content of StatisticItem 2022-02-02 13:29:18 +08:00
Dean Herbert
4b646709c1
Merge pull request #16658 from Spooghetti420/no-long-notes-mod
Add "Hold Off" mod (no long notes)
2022-02-02 13:35:44 +09:00
Dean Herbert
ddc8094a75 Update description 2022-02-02 13:34:23 +09:00
Bartłomiej Dach
e4028b8fc1
Remove index ctor param from ColumnHitObjectArea
No longer used since 5692cecaa4.
2022-02-01 21:49:52 +01:00
Spooghetti420
b75c08c9ab
Improve beat length logic
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-02-01 13:36:36 +00:00
Dan Balasescu
0641264a11 Merge branch 'master' into spectator-consistency-frames 2022-02-01 14:35:30 +09:00
Dean Herbert
2f88efd3c3 Pass column in rather than accessing parent 2022-02-01 00:53:56 +09:00
Spooghetti420
e5601772a9 Make incompatible with 2022-01-31 15:00:36 +00:00
Dan Balasescu
0458d408bb Add replay statistics frames to FramedReplayInputHandler 2022-01-31 18:53:47 +09:00
Dean Herbert
0e764538e0 Retrieve KeyBindingContainer via DI rather than traversal lookup 2022-01-31 17:05:04 +09:00
Dean Herbert
cc7fb0e559 Add mouse click support and increase area to full column height 2022-01-31 16:37:02 +09:00
Dean Herbert
a84fd2e20c
Merge branch 'master' into master 2022-01-31 16:30:08 +09:00
Dean Herbert
bb8dc74e88 Fix constant formatting 2022-01-31 12:20:51 +09:00
Spooghetti420
b52153e73d Remove settings 2022-01-30 17:40:15 +00:00
Dean Herbert
035a84e75c Rename function and make public again for test usage 2022-01-29 14:05:23 +09:00
Dean Herbert
c75ffe9b07 Apply code style changes 2022-01-29 13:47:04 +09:00
Spooghetti420
a4aa501bb5 Change threshold from ms to beat-based, add tests 2022-01-28 21:59:53 +00:00
Spooghetti420
146c54a2c1 Fix code formatting 2022-01-27 21:02:59 +00:00
Spooghetti420
3e068e564d Update mod per discussion + create test 2022-01-27 20:56:51 +00:00
Spooghetti420
400633bd99 Add another newline 2022-01-27 16:23:09 +00:00
Spooghetti420
c0b2f8bd01 Fix newline style in mod 2022-01-27 16:21:38 +00:00
Spooghetti420
5dd829cb3a Merge branch 'master' of https://github.com/ppy/osu into no-long-notes-mod 2022-01-27 16:10:16 +00:00
Spooghetti420
1bdf16494b Add No Long Notes mod 2022-01-27 11:35:31 +00:00
Dean Herbert
5288eedd31 Update all usages of RulesetID and Ruleset.ID to use Ruleset.OnlineID 2022-01-27 15:38:03 +09:00
Bartłomiej Dach
2375420d4c
Tweak allowable ranges of size multiplier 2022-01-24 21:32:31 +01:00
Bartłomiej Dach
4a13c93ca7
Disallow zero size multiplier in flashlight implementations 2022-01-24 21:03:03 +01:00
Bartłomiej Dach
a227af75ed
Simplify flashlight parameter passing flow 2022-01-24 21:03:02 +01:00
Bartłomiej Dach
5874475dff
Extract DefaultFlashlightSize to base flashlight class 2022-01-24 21:03:02 +01:00
Bartłomiej Dach
a7c0d507ce
Rename flashlight settings to be more accurate 2022-01-24 21:03:02 +01:00
mk-56
948867898c ModeMultiplier rename 2022-01-24 11:38:52 +01:00
mk-56
161a2a321e Remove bindable from ModeMultiplier 2022-01-24 09:07:07 +01:00
mk-56
ed84ae0ac0 Adjust values to Bdach's refined taste 2022-01-24 00:42:43 +01:00
mk-56
955bab926f Separate the settings for each modes radiuses 2022-01-22 19:38:56 +01:00
MK56
b5f813a949
Merge branch 'ppy:master' into Liswiera-FL-changes 2022-01-22 19:04:39 +01:00
Bartłomiej Dach
1ce0b18003
Merge branch 'master' into display-performance-attributes 2022-01-22 14:12:57 +01:00
Dean Herbert
7f65f3a47f Remove all usage of BaseDifficulty (and access Difficulty instead) 2022-01-18 22:57:39 +09:00
mk-56
bd308ca38c Cleanup 2022-01-17 15:15:25 +01:00