f629c33dc0
Make explosion additive to match stable
2020-09-22 12:14:31 +09:00
bfe332909c
Remove "hide combo counter on break time" feature for being too complex
...
The combo counter will be hidden at most one second after the break has started anyways, so why not just remove this feature if the way of implementing it is complicated to be merged within the legacy counter implementation.
2020-09-21 14:32:14 +03:00
1e09d8fd1a
Merge branch 'master' into catch-combo-counter
2020-09-21 17:53:00 +09:00
c7d24203ce
Make beatmap conversion support cancellation tokens
2020-09-17 17:40:05 +09:00
0761aab42f
Merge branch 'master' into catch-combo-counter
2020-09-15 17:20:31 +09:00
fcf3a1d13c
Encapsulate combo display better
2020-09-12 22:40:34 +02:00
3db0e7cd75
Generalise LegacyRollingCounter
2020-09-12 22:40:32 +02:00
117c7ec6b2
Merge branch 'master' into score-recalc
2020-09-09 14:38:36 +09:00
4680728b9c
Merge branch 'master' into update-dcc-exclusions
2020-09-07 18:01:44 +09:00
1143d5d992
Update class exclusion for dynamic compilation
2020-09-04 20:41:08 +09:00
25e142965d
Strongly type and expose default beatmap information icon implementations for other rulesets
2020-09-04 15:01:32 +09:00
72cb65c22f
Update and add missing beatmap statistic icons to info wedge
2020-09-03 17:52:22 +09:00
99a68e880a
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-09-01 20:46:38 +03:00
a0a4501008
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-09-01 20:17:25 +03:00
ba8a4eb6f0
Move osu!catch combo counter display to inside CatcherArea
2020-09-01 20:17:21 +03:00
1c1afa1c96
Move MaxCombo to base DifficultyAttributes
2020-08-28 19:16:20 +09:00
8dde512657
Merge branch 'master' into skin-colour-fix-2
2020-08-25 19:39:01 +09:00
ab8d9be095
Move out into a separate method
2020-08-25 15:16:41 +09:00
60695bee8c
Remove fades when changing trail colour across skins
2020-08-24 15:57:41 +02:00
db45d9aa8a
Fix catch hyper dash colour defaults not being set correctly
...
As the defaults were not set, if a skin happened to specify 0,0,0,0 it
would be ignored due to the early returns in property setters.
2020-08-24 22:11:10 +09:00
997ea2f27e
Merge pull request #9932 from smoogipoo/hyperdash-full-catch-width
...
Use full catcher width for hyperdash calculation
2020-08-24 16:44:35 +09:00
12ca870b74
Fix osu!catch relax mod
2020-08-23 17:34:57 +02:00
0e9242ee9a
Move combo font retrieval inside the legacy component
2020-08-23 10:29:01 +03:00
b98d4d9cff
Merge branch 'master' into hyperdash-full-catch-width
2020-08-22 19:55:45 +09:00
cf6b34db1e
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-08-22 13:07:28 +03:00
7ae45b29db
Finish internal counter transformation regardless of the combo
2020-08-22 12:20:50 +03:00
eaba323353
Update catch with legacy colour setters
2020-08-22 00:17:35 +09:00
62d833d63d
Fix comment
2020-08-21 13:14:50 +09:00
6ad7a3686b
Simplify condition
2020-08-21 13:13:08 +09:00
855b5ba4ed
Merge branch 'master' into add-droplet-hypers
2020-08-21 13:09:16 +09:00
f0ba587515
Merge branch 'master' into fix-catch-double-sample
2020-08-21 12:38:29 +09:00
f00bc67aaa
Fix pulp and use relative sizse
2020-08-21 12:29:28 +09:00
738ff7ba21
Use full catcher width for hyperdash calculation
2020-08-21 02:21:16 +09:00
9546fbb64b
Prevent catcher from performing invalid catches
2020-08-20 19:06:29 +02:00
28534c1599
Reintroduce PalpableCatchHitObject at data level
2020-08-20 19:06:26 +02:00
f956c9fe37
Clobber in a gameplay test
2020-08-21 02:01:29 +09:00
45e2ea71b4
Rename Palpable{-> Drawable}CatchHitObject
2020-08-20 18:41:08 +02:00
75db762553
Merge pull request #9926 from peppy/catch-playfield-width-adjust
...
Fix osu!catch playfield bounds not matching expectations
2020-08-20 23:42:17 +09:00
40a456170b
Add default skin display for hyperdash droplets
2020-08-20 23:34:40 +09:00
c89509aca0
Fix right bound not being applied correctly
2020-08-20 20:25:40 +09:00
a94a86178b
Align osu!catch playfield with stable 1:1
2020-08-20 19:12:37 +09:00
1f14d9b690
Use correct width adjust for osu!catch playfield
2020-08-20 18:15:06 +09:00
af52b73b06
Fill out missing documentation
2020-08-19 08:39:40 +03:00
d4bde0afe5
Do not pass accent value on a reverted miss judgement
2020-08-19 08:18:30 +03:00
885f8104f5
Always use public accessors even on legacy classes
...
Because of https://github.com/ppy/osu-framework/issues/3727
2020-08-19 08:00:57 +03:00
422100192c
Move HasFont to legacy skin extensions class instead
2020-08-19 07:58:23 +03:00
4dbf695bca
Fix wrong ordering
2020-08-04 00:04:00 +03:00
65c269e473
Hide combo counter on gameplay break
...
Intentionally inside LegacyComboCounter and not in CatchComboDisplay, to avoid conflicting with how the legacy combo counter fades away after 1 second of no combo update, can move to parent once a DefaultComboCounter design is decided and code is shareable between.
2020-08-03 22:17:11 +03:00
f37ba49f7f
Add catch-specific combo counter with its legacy design
2020-08-03 22:13:02 +03:00
29053048ff
Add support to use legacy combo fonts for the counter on legacy skins
2020-08-03 21:40:20 +03:00