1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 06:19:38 +08:00
Commit Graph

2227 Commits

Author SHA1 Message Date
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