1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 07:20:24 +08:00
Commit Graph

68177 Commits

Author SHA1 Message Date
Dean Herbert
3650f3c479
Allow multiple ducks with same parameters 2024-07-08 13:52:40 +09:00
Dean Herbert
aa36a844be
Reduce precision requirement for tests 2024-07-08 13:49:25 +09:00
Dean Herbert
0067450b22
Change volume parameter to double 2024-07-08 13:47:57 +09:00
Salman Ahmed
2bfa03c6d8 Rename test scene file 2024-07-08 07:37:42 +03:00
Dean Herbert
5907e0d1eb
Make DuckDuration non-zero by default 2024-07-05 18:39:13 +09:00
Dean Herbert
7efb4ce30a
Fix multiple disposals resulting in assert being hit 2024-07-05 18:39:12 +09:00
Dean Herbert
65418aca1a
Add basic test coverage 2024-07-05 18:35:54 +09:00
Dean Herbert
717f7ba9f0
Better support multiple concurrent ducking operations 2024-07-05 18:12:40 +09:00
Dan Balasescu
0bb6c252a7
Merge pull request #28746 from bdach/fix-ternary-state-breakage
Fix incorrect ternary state computation for bank toggles
2024-07-05 17:42:27 +09:00
Bartłomiej Dach
4c59ec1d94
Fix incorrect ternary state computation for bank toggles
Closes https://github.com/ppy/osu/issues/28741.

Regressed in a7b066f3ee.

The intent of the original change there was to ensure that addition
banks being set will put the ternary state toggles in indeterminate
state (to at least provide a visual indication that the selection does
not use a single bank). This would previously not be the case due to
the use of `.All()` in the original condition (a single object/node
was considered to have a bank enabled if and only if *all* samples
within it used it). However the attempt to fix that via switching
to `Any()` was not correct.

The logic used in the offending commit operates on extracted `Samples`
and `NodeSamples` from the selection, and would consider the ternary
toggle:

- fully off if none of the samples/node samples contained a sample with
  the given bank,
- indeterminate if the some of the samples/node samples contained a
  sample with the given bank,
- fully on if at least one sample from every samples/node samples
  contained a sample with the given bank.

This is a *two-tiered* process, as in first a *binary* on/off state is
extracted from each object's samples/node samples, and *then* a ternary
state is extracted from all objects/nodes. This is insufficient to
express the *desired* behaviour, which is that the toggle should be:

- fully off if *none of the individual samples in the selection* use
  the given bank,
- indeterminate if *at least one individual sample in the selection*
  uses the given bank,
- fully on if *all individual samples in the selection* use the given
  bank.

The second wording is flattened, and no longer tries to consider "nodes"
or "objects", it just looks at all of the samples in the selection
without concern as to whether they're from separate objects/nodes
or not.

To explain why this discrepancy caused the bug, consider a single object
with a `soft` normal bank and `drum` addition bank. Selecting the object
would cause a ternary button state update; as per the incorrect logic,
there were two samples on the object and each had its own separate
banks, so two ternary toggles would have their state set to `True`
(rather than the correct `Indeterminate`), thus triggering a bindable
feedback loop that would cause one of these banks to win and actually
overwrite the other.

Note that the addition indeterminate state computation *still* needs
to do the two-tiered process, because there it actually makes sense (for
a selection to have an addition fully on rather than indeterminate,
*every* object/node *must* contain that addition).
2024-07-05 09:27:21 +02:00
Bartłomiej Dach
d6c1b5d399
Add failing test coverage 2024-07-05 08:54:47 +02:00
Bartłomiej Dach
f8a2b0724d
Merge pull request #28726 from OliBomby/nodesample-inherit
Fix node samples always having default samples on placement
2024-07-05 08:45:35 +02:00
Bartłomiej Dach
6907d3d3b5
Merge branch 'master' into nodesample-inherit 2024-07-05 08:12:47 +02:00
Bartłomiej Dach
ab8623ec48
Merge pull request #28727 from OliBomby/inherit-addition
Allow inheriting addition bank from previous hitobject when using auto bank assignment
2024-07-05 08:12:30 +02:00
Dean Herbert
20ba6ca867
Add mention of return type for Duck method 2024-07-05 15:11:11 +09:00
Dean Herbert
31ed0d219a
Merge branch 'master' into audio-ducking-fx 2024-07-05 15:08:41 +09:00
Dean Herbert
554740af10
Adjust ducking API to use a parameters record 2024-07-05 15:04:40 +09:00
Dean Herbert
bab1216c6e
Merge pull request #28745 from peppy/music-controller-nullability
Apply nullability to `MusicController`
2024-07-05 15:04:28 +09:00
Dean Herbert
0d858ce8f8
Change default easings to In/Out for all ducking operations 2024-07-05 13:51:41 +09:00
Dean Herbert
ec4623d49f
Reduce duck length slightly on toolbar ruleset selector 2024-07-05 13:51:29 +09:00
Dean Herbert
4528daf7fa
Update resources 2024-07-05 13:15:15 +09:00
Dean Herbert
482ac32f01
Remove and ignore encodings.xml
Disappeared in latest EAP and doesn't look like something we would have
wanted to be committed in the first place.
2024-07-05 13:00:10 +09:00
Dean Herbert
0696e2df32
Apply nullability to ducking methods 2024-07-05 12:58:34 +09:00
Dean Herbert
7f84e377ab
Merge branch 'music-controller-nullability' into audio-ducking-fx 2024-07-05 12:57:39 +09:00
Dean Herbert
d21eec9542
Apply nullability to MusicController 2024-07-05 12:50:15 +09:00
Dan Balasescu
aaef5c189d
Merge pull request #28739 from peppy/fix-skin-fallbacks
Fix incorrect skin fallback order when beatmap skin is present
2024-07-05 12:05:57 +09:00
Dean Herbert
f201cc3fea
Expand explanation in inline comment 2024-07-05 10:09:06 +09:00
Dean Herbert
f0ad7a97cb
Merge branch 'master' into daily-challenge/better-results 2024-07-04 23:56:09 +09:00
Dean Herbert
aa72c09c3a
Merge pull request #28659 from bdach/daily-challenge/integration
Use room watching functionality to receive realtime daily challenge updates
2024-07-04 23:55:46 +09:00
Bartłomiej Dach
c524c23db6
Merge branch 'master' into inherit-addition 2024-07-04 15:24:59 +02:00
Bartłomiej Dach
ea9dd841c0
Merge pull request #28728 from OliBomby/inherit-volume
Always inherit the volume from the previous hit object on placement
2024-07-04 15:24:34 +02:00
Bartłomiej Dach
652d2e9633
Adjust code style 2024-07-04 15:19:36 +02:00
Bartłomiej Dach
e005b46df9
Extend test coverage 2024-07-04 15:19:28 +02:00
Bartłomiej Dach
8b4155fc0a
Merge branch 'inherit-addition' into nodesample-inherit 2024-07-04 15:13:20 +02:00
Bartłomiej Dach
08a77bfe38
Extend test coverage 2024-07-04 15:10:49 +02:00
Bartłomiej Dach
faedf268ec
Merge branch 'inherit-volume' into inherit-addition 2024-07-04 14:52:05 +02:00
Bartłomiej Dach
72492a79cd
Reduce duplication in new logic 2024-07-04 14:45:46 +02:00
Bartłomiej Dach
ea4e6cf1d7
Add test coverage 2024-07-04 14:39:11 +02:00
Bartłomiej Dach
244c4d7c20
Merge pull request #28738 from frenzibyte/fix-editor-difficulty-switch
Fix editor not updating ruleset when switching difficulty
2024-07-04 14:20:32 +02:00
Bartłomiej Dach
5fa586848d
Replace old bad daily challenge leaderboard with new implementation
- Actually shows scores rather than playlist aggregates (which are
  useful... in playlists, where there is more than one item)
- Actually allows scores to be shown by clicking on them
- Doesn't completely break down visually on smaller window sizes

The general appearance is not as polished as the old one in details but
I wanted something quick that we can get out by next weekend.

Also includes the naive method of refetching scores once a new top 50
score is detected. I can add a stagger if required.
2024-07-04 13:52:08 +02:00
Bartłomiej Dach
8e8909c999
Adjust daily challenge screen background colour 2024-07-04 13:49:33 +02:00
Bartłomiej Dach
b29e535ca5
Add results screen for displaying arbitrary daily challenge scores
At this point its primary usage is the daily challenge event feed, but
the leaderboard will be using this too shortly.

Because the playlists results screen that exists in `master` is
hard-coupled to showing the *local user's* best result on a given
playlist by way of hard-coupling itself to the relevant API request,
allowing show of *arbitrary* score by ID requires a whole bunch of
subclassery as things stand. Oh well.

Class naming is... best effort, due to the above.
2024-07-04 13:45:24 +02:00
Dean Herbert
e3c8bee7d0
Fix nullability failure 2024-07-04 20:17:40 +09:00
Dean Herbert
b2af49c102
Fix classic fallback not having a transformer (and only add if required) 2024-07-04 20:17:39 +09:00
Salman Ahmed
207ee8a2ee Fix editor not updating ruleset when switching difficulty 2024-07-04 14:06:36 +03:00
Salman Ahmed
7a0a5620e1 Add failing test case 2024-07-04 14:06:18 +03:00
Jamie Taylor
a5077fcb3f
Rename TimedDuck -> DuckMomentarily 2024-07-04 17:22:33 +09:00
Dean Herbert
a4c575f77a
Merge pull request #28521 from bdach/tempo-adjust-editor
Change editor speed adjustment back to adjusting tempo
2024-07-04 16:42:55 +09:00
Dean Herbert
3f138489a1
Merge pull request #28509 from bdach/slider-anchor-type-switching
Add ability to cycle slider control point types via keyboard
2024-07-04 16:11:37 +09:00
Jamie Taylor
82e4e884d7
Change overlapping Duck() usages to be a noop instead of a throw 2024-07-04 15:51:50 +09:00