Commit Graph

68 Commits

Author SHA1 Message Date
Salman Ahmed 43c1e1d217 Update existing usages
Resolve post-conflict issues
2021-03-13 06:09:07 +03:00
Joehu 9ef130cdcc Fix codefactor style issues 2021-02-04 13:28:35 -08:00
ekrctb df9de7a8dd Remove null check that is not required anymore 2020-12-09 10:28:42 +09:00
ekrctb a32dac00dd Introduce IHasCatchObjectState implemented by DHO and CaughtObject 2020-12-08 21:29:26 +09:00
ekrctb c301223d8c Make object on the catcher plate separate CaughtObject class 2020-12-08 21:11:40 +09:00
ekrctb 4d5c242d35 Use virtual property instead of a field for optional pieces 2020-12-08 17:15:40 +09:00
ekrctb 603cecb2eb Make CatchHitObjectPiece abstract class 2020-12-08 17:02:57 +09:00
ekrctb 17d48c82f6 Use switch statement instead of an array 2020-12-08 16:59:06 +09:00
ekrctb 4da6717d0e Rename things in PulpFormation 2020-12-08 10:33:18 +09:00
ekrctb 3cbdaf5960 Make resolved properties protected 2020-12-08 10:30:23 +09:00
ekrctb b2e5658d23 Merge branch 'master' into fruit-piece-in-place 2020-12-07 18:57:42 +09:00
ekrctb 7f1ad1040d Don't inherit DrawableFruit from DrawableBanana
- A banana cannot be hyper
2020-12-07 14:08:50 +09:00
ekrctb c0f39514b9 Fix legacy droplet scale 2020-12-07 14:00:22 +09:00
ekrctb d51d2c5331 Don't recreate pieces when catch DHO is reused 2020-12-07 12:59:03 +09:00
ekrctb 87189452d1 Refactor legacy skin piece to allow texture update 2020-12-07 12:57:24 +09:00
ekrctb d18397acad Adjust namespace 2020-12-07 12:35:24 +09:00
ekrctb b4b9312e0f Move piece files of Catch ruleset 2020-12-07 12:34:38 +09:00
ekrctb 4cd234ea05 Fix null reference of LegacyFruitPiece 2020-11-30 19:56:12 +09:00
ekrctb 323533d945 Add hiding Palpable HitObject property 2020-11-25 08:07:59 +09:00
ekrctb ab7251d742 Move members to `PalpableCatchHitObject` 2020-11-24 19:57:37 +09:00
Dean Herbert 8a3bce3cc3 Fix osu!catch showing two combo counters for legacy skins 2020-10-16 18:20:17 +09:00
Dean Herbert 899bac6ca5 Rename catch combo counter for clarity 2020-10-14 19:16:34 +09:00
Dean Herbert 1b261f177f Disable rewind handling 2020-09-22 13:17:53 +09:00
Dean Herbert 1c58f568d6 Simplify and reformat rewind/transform logic 2020-09-22 12:54:21 +09:00
Dean Herbert ffd4874ac0 Remove unnecessary double suffixes 2020-09-22 12:37:18 +09:00
Dean Herbert 08d8975566 Remove DisplayInitialCombo method for simplicity 2020-09-22 12:35:18 +09:00
Dean Herbert 92cda6bccb Adjust xmldoc slightly 2020-09-22 12:27:47 +09:00
Dean Herbert a27a65bf03 Don't recreate explosion counter each increment 2020-09-22 12:25:40 +09:00
Dean Herbert f629c33dc0 Make explosion additive to match stable 2020-09-22 12:14:31 +09:00
Salman Ahmed 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
Bartłomiej Dach 3db0e7cd75 Generalise LegacyRollingCounter 2020-09-12 22:40:32 +02:00
Salman Ahmed 99a68e880a Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-09-01 20:46:38 +03:00
Salman Ahmed a0a4501008 Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-09-01 20:17:25 +03:00
smoogipoo ab8d9be095 Move out into a separate method 2020-08-25 15:16:41 +09:00
Salman Ahmed 0e9242ee9a Move combo font retrieval inside the legacy component 2020-08-23 10:29:01 +03:00
Salman Ahmed 7ae45b29db Finish internal counter transformation regardless of the combo 2020-08-22 12:20:50 +03:00
smoogipoo eaba323353 Update catch with legacy colour setters 2020-08-22 00:17:35 +09:00
Salman Ahmed af52b73b06 Fill out missing documentation 2020-08-19 08:39:40 +03:00
Salman Ahmed 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
Salman Ahmed 422100192c Move HasFont to legacy skin extensions class instead 2020-08-19 07:58:23 +03:00
Salman Ahmed 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
Salman Ahmed f37ba49f7f Add catch-specific combo counter with its legacy design 2020-08-03 22:13:02 +03:00
Salman Ahmed 29053048ff Add support to use legacy combo fonts for the counter on legacy skins 2020-08-03 21:40:20 +03:00
Bartłomiej Dach ad85c5f538 Add base legacy skin transformer 2020-06-21 23:06:55 +02:00
Salman Ahmed b161aa72b7
Merge remote-tracking branch 'upstream/master' into catch-legacy-skin-decoding 2020-05-14 07:22:01 +03:00
Salman Ahmed 5f13dc81be Remove no longer necessary extensions 2020-04-14 04:38:18 +03:00
Salman Ahmed d27d8671ab Convert all static getter-only properties to static readonly fields 2020-04-08 14:23:29 +03:00
Salman Ahmed 7f3ad6d5be Move default colour fallback to the extension methods itself 2020-04-05 22:15:11 +03:00
Salman Ahmed 42ac0c72ea Fix grammer issue and more rewording
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-05 00:46:52 +03:00
Salman Ahmed b8327ed877 Add test for osu!catch skin colour decoding
Tests the skin configuration CatchTheBeat section's colours decoding part
2020-04-05 00:30:10 +03:00