1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 12:37:47 +08:00
Commit Graph

229 Commits

Author SHA1 Message Date
Dean Herbert
c32af3c041 Merge branch 'master' into hongaaronc/master 2022-07-22 15:55:38 +09:00
Salman Ahmed
28150dc15d Merge branch 'master' into taiko-target-classic-position 2022-07-18 20:45:29 +03:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Dean Herbert
859a83ac90 Remove unused field and fix typo 2022-06-02 14:48:26 +09:00
Aaron Hong
f6e9dfe7bf Fix naming rule violations 2022-06-01 01:03:21 -07:00
Aaron Hong
2471c242b4 Merge branch 'master' of https://github.com/ppy/osu into ppy-master 2022-05-31 21:01:04 -07:00
Salman Ahmed
61078910a6 Handle all skin component types explicitly 2022-04-23 03:34:05 +03:00
Salman Ahmed
b84a3b7834 Rewrite input drum measurements to autosize on X axis 2022-04-07 21:39:53 +03:00
Salman Ahmed
ce70957fbf Remove redundant code 2022-04-06 02:38:56 +03:00
Salman Ahmed
55c56c03a5 Propagate legacy input drum size to main piece 2022-04-06 02:34:07 +03:00
Dean Herbert
2d020e756d
Merge pull request #17621 from frenzibyte/taiko-target-size
Adjust osu!taiko legacy hit target size to match osu!(stable)
2022-04-05 12:37:40 +09:00
Salman Ahmed
534cc18ff9 Adjust osu!taiko legacy hit target size to match osu!(stable) 2022-04-03 01:21:48 +03:00
Salman Ahmed
4ce69890d4 Use TaikoHitObject.DEFAULT_SIZE for default circle piece symbol size 2022-04-03 00:21:23 +03:00
Aaron Hong
6f99455d94 Improve centre input size fitting for legacy skins 2022-03-12 05:17:45 -08:00
Aaron Hong
7336c2c0bd Fix osu!taiko alignment issue with legacy skins on Touch Controls 2022-03-11 02:48:08 -08:00
Aaron Hong
38c61b2c1d Fix crash when loading legacy osu!taiko skins with touch input 2022-03-11 00:14:33 -08:00
Bartłomiej Dach
735414bc49
Replace TimeSignatures enum with struct for storage of arbitrary meter 2022-01-22 20:50:31 +01:00
Susko3
19467e58c1 Remove unused params from BDL methods 2022-01-15 01:06:39 +01:00
Dean Herbert
add39fbd4f Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-28 06:24:24 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Dean Herbert
93482414d6 Remove SkinConfiguration subclasses and allow configuration parsing for all skin types 2021-10-22 14:42:23 +09:00
Dean Herbert
32afd3f426 Replace all basic usages 2021-10-02 02:22:23 +09:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
Dean Herbert
90e81a595d Move DrumSampleTriggerSource into its own class to avoid nested references 2021-08-26 17:19:46 +09:00
Dean Herbert
8e0a04c4e5 Update taiko InputDrum to use new trigger logic 2021-08-25 16:56:44 +09:00
Dean Herbert
4b45d8318e
Merge branch 'master' into transformers-per-skin 2021-06-16 16:37:28 +09:00
Salman Ahmed
fbb856d84b Call base when overriding lookup methods
Rather than arbitrarily accessing `Skin` here and there.
2021-06-11 12:44:44 +03:00
Dean Herbert
9c34cb0777 Share colour constants with default drawable piece implementations 2021-06-11 14:20:08 +09:00
Salman Ahmed
cf40282f1f Convert LegacySkinTransformers to accept raw ISkins rather than a full ISkinSource 2021-06-09 22:49:31 +03:00
Dean Herbert
2e2281c7d2 Revert disabling taiko sample tests and fix logic 2021-06-01 18:57:19 +09:00
Dean Herbert
17574833fb Update other transformers with similar refactored logic 2021-05-30 19:15:59 +09:00
Salman Ahmed
fbc316ea1d Fix legacy skin transformers potentially ignoring source implementations 2021-05-29 21:23:22 +03:00
Bartłomiej Dach
f716fb0968 Remove bogus InternalChildren null-check
`InternalChildren` can't viably be `null`, and if it were, we have
bigger problems. The removed null-check was triggering false-positive
inspections further down.
2021-05-15 00:09:34 +02:00
Bartłomiej Dach
aec859b4d1 Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-18 19:51:46 +01:00
smoogipoo
0c3c8141da Remove Expires and RemoveWhenNotAlive override 2021-03-18 19:39:42 +09:00
Bartłomiej Dach
3bfde7341f Revert "Remove unnecessary overrides"
This reverts commit f4e508b570.
2021-03-17 17:14:53 +01:00
Bartłomiej Dach
f4e508b570 Remove unnecessary overrides 2021-03-15 20:43:30 +01:00
Bartłomiej Dach
58220481db Rename I{-> Animatable}HitExplosion 2021-03-15 20:39:02 +01:00
Bartłomiej Dach
8b74666cc3 Add support for pooling explosions in taiko 2021-03-14 16:15:33 +01:00
Bartłomiej Dach
ad1b86e33a Change LifetimeEnd idiom to Expire() for readability 2021-03-06 18:54:25 +01:00
Bartłomiej Dach
06e42b4b4c Fix taiko leaving behind empty judgements on legacy skins 2021-03-06 16:02:20 +01:00
Dean Herbert
00574a5288 Use ISample everywhere in Skin GetSample lookup path 2021-02-18 18:32:28 +09:00
smoogipoo
de9d075f94 Initial sample + samplechannel rework 2021-01-19 17:11:40 +09:00
Bartłomiej Dach
5af1ac1b53 Rename TaikoStrong{-> able}HitObject 2020-12-14 21:46:02 +01:00
Bartłomiej Dach
b1635ecd16 Reflect can-be-strong split in DHO structure 2020-12-13 13:08:30 +01:00
ekrctb
c70b13ecc2 Adjust namespace 2020-12-07 12:30:25 +09:00
ekrctb
f78bd7c739 Move piece files of Taiko ruleset 2020-12-07 12:29:14 +09:00
Bartłomiej Dach
891218ec6b Inline empty explosion in legacy transformer 2020-11-11 09:11:33 +01:00
Bartłomiej Dach
be4735cd2b Explicitly set lifetime to ensure empty drawables are cleaned up 2020-11-10 14:57:51 +01:00
Bartłomiej Dach
0387d994bd Do not lookup default kiai explosion if skin has own 2020-11-10 14:18:43 +01:00
Dean Herbert
2ec2749cb4 Fix taiko lookup logic 2020-10-30 11:59:41 +09:00
Dean Herbert
8c528c8910 Fix legacy taiko skins showing double judgements 2020-10-07 18:36:40 +09:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
smoogipoo
7890319802 Merge branch 'master' into adjust-hit-result-types 2020-10-01 16:19:07 +09:00
smoogipoo
cb6b35116a Merge branch 'master' into scoring-standardisation 2020-10-01 12:28:51 +09:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
smoogipoo
c45b5690cf Use new hit results in taiko 2020-09-29 16:33:38 +09:00
Bartłomiej Dach
2fb9a5d734 Remove no longer required field 2020-09-28 17:53:32 +02:00
Bartłomiej Dach
f6f267a43a Switch to strong sprite exactly once 2020-09-28 17:53:12 +02:00
Bartłomiej Dach
0900661b23 Use IsHit for strong hit instead of checking result type 2020-09-28 16:34:04 +02:00
Bartłomiej Dach
4944128631 Ensure both sprites are centered 2020-09-27 18:11:12 +02:00
Bartłomiej Dach
2f7c0b4934 Allow switching between legacy sprites 2020-09-27 16:07:19 +02:00
Bartłomiej Dach
eb62ad4e55 Look up both sprites for legacy explosions 2020-09-27 16:06:59 +02:00
Bartłomiej Dach
d5f1d94b51 Allow specifying two sprites for legacy hit explosions 2020-09-27 15:52:40 +02:00
Bartłomiej Dach
919b19612f Add lookups for strong hit explosions 2020-09-20 19:40:30 +02:00
smoogipoo
2cf2ba8fc5 Store computed accent colour to local 2020-08-26 14:24:04 +09:00
smoogipoo
ab8d9be095 Move out into a separate method 2020-08-25 15:16:41 +09:00
smoogipoo
9fbc5f3aeb Update taiko with legacy colour setters 2020-08-22 00:23:08 +09:00
Bartłomiej Dach
648f9204f5 Add sample lifetime constraints for taiko 2020-07-26 17:50:25 +02:00
Bartłomiej Dach
ea3ef37f9a Add support for indexless mascot texture lookups 2020-07-25 12:03:54 +02:00
smoogipoo
fc0f3f9171 Fix taiko drumroll bodies behaving badly with edge alphas 2020-07-17 16:55:01 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
Bartłomiej Dach
ad85c5f538 Add base legacy skin transformer 2020-06-21 23:06:55 +02:00
smoogipoo
4bf5477252 Merge branch 'master' into fix-taiko-scroller-time-control 2020-05-14 17:04:09 +09:00
Dean Herbert
134a94e86d Rename enum members (no idea what a TaikoDon is) 2020-05-14 10:02:47 +09:00
Dean Herbert
00efeb7cc6 Fix spawning too many sprites due to not yet populated sizing 2020-05-13 19:19:58 +09:00
Dean Herbert
e28e89213f Fix incorrect spawning when scale adjustments are applied to child sprites 2020-05-12 16:58:47 +09:00
Dean Herbert
c7d8793c1d Remove unnecessary overlap 2020-05-12 15:44:14 +09:00
Dean Herbert
949e17cc0e Rework scroller to support backwards playback 2020-05-12 15:23:47 +09:00
Dean Herbert
3b1680583e Fix taiko scroller not following gameplay time 2020-05-12 11:31:08 +09:00
Craftplacer
43342c57b8
Fix switch case
... caused by a poor merge
2020-05-11 07:13:06 +02:00
Dan Balasescu
d697de29a6
Merge branch 'master' into taiko-don 2020-05-11 13:24:27 +09:00
Dean Herbert
8243dc239a
Merge branch 'master' into taiko-don 2020-05-10 22:34:47 +09:00
Dean Herbert
5902cd81a4 Move passing transforms to post-load for safety 2020-05-10 07:52:54 +09:00
Dean Herbert
3565fe1cb2 Fix incorrect passing logic 2020-05-10 07:51:39 +09:00
Dean Herbert
115cbf25ae Fix new sprites not getting spawned with correct passing state 2020-05-08 19:15:19 +09:00
Dean Herbert
1a31e1f10f Also check for AffectsCombo to avoid too many passing switches 2020-05-08 19:13:41 +09:00
Dean Herbert
cea6be5e52 Expose as JudgementResult instead of "passing" state 2020-05-03 23:55:44 +09:00
Dean Herbert
ff1d63060d Add and consume passing state in GameplayBeatmap 2020-05-01 20:08:18 +09:00
Dean Herbert
3033ab80ce Add passing/failing test 2020-05-01 19:49:30 +09:00
Dean Herbert
6ff31fb786 Fix sizing when gameplay scale is adjusted 2020-05-01 19:49:23 +09:00
Dean Herbert
510df8b282 Improve tiling logic 2020-05-01 19:49:01 +09:00
Dean Herbert
8955b98cbb Add basic taiko scroller implementation 2020-05-01 17:56:09 +09:00
Dan Balasescu
68efdd145d
Merge pull request #8909 from peppy/fix-legacy-explosion-rewind
Fix skinned taiko hit explosions not being removed on rewind
2020-04-30 21:00:41 +09:00
Dean Herbert
d0a8c0fa71 Add kiai support to osu!taiko skinned playfields 2020-04-30 16:43:00 +09:00
Dean Herbert
48af4d4eb4 Fix skinned taiko hit explosions not being removed on rewind 2020-04-30 16:18:15 +09:00
Dean Herbert
48733a7e2f Change taiko hit explosion animation to match stable for skins 2020-04-29 17:53:37 +09:00
Bartłomiej Dach
5f0a4103c2 Merge branch 'master' into taiko-don 2020-04-28 23:46:42 +02:00
Dan Balasescu
79e1b16119
Merge branch 'master' into taiko-explosion-skinning 2020-04-28 12:17:09 +09:00
Dean Herbert
84641765c5 Adjust exceptions and fix capitalisation 2020-04-28 11:08:19 +09:00
Dean Herbert
be59ee945a Add taiko hit explosion skinning support 2020-04-27 22:36:27 +09:00
Craftplacer
e8a0b77729 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-27 12:43:51 +02:00
Dean Herbert
ca055581af Fix taiko hit target alpha on legacy skins 2020-04-27 18:18:11 +09:00
Craftplacer
e830c7d833 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-27 02:13:09 +02:00
Craftplacer
dbf39be607 Decide on the name "Mascot", add testing, bug fixed, etc. 2020-04-24 06:59:05 +02:00
Dean Herbert
12f156dcec Add taiko barline skinning support 2020-04-23 14:32:48 +09:00
Dean Herbert
b4e1ad81d0 Fix alignment of right half of legacy input drum 2020-04-23 13:48:08 +09:00
Dean Herbert
559487b205 Move playfield background implementation to its own file 2020-04-23 13:23:49 +09:00
Dean Herbert
4032d66959 Apply same legacy scale adjust logic to TaikoLegacyHitTarget 2020-04-23 13:17:46 +09:00
Dean Herbert
61d2580e1c Fix gap to left of InputDrum on legacy skins 2020-04-23 13:07:38 +09:00
Dean Herbert
49568a3d56 Adjust input drum to work with new playfield changes 2020-04-23 12:49:53 +09:00
Dean Herbert
37f7e0a734 Restructure TaikoPlayfield for better skin support 2020-04-23 12:49:53 +09:00
Dean Herbert
ca56e6c0d2 Rename taiko HitTarget classes to avoid conflict with mania 2020-04-23 12:11:30 +09:00
Craftplacer
8446fa98b5 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-22 15:21:54 +02:00
Craftplacer
617d27ace9 Restart branch 2020-04-22 15:19:29 +02:00
Dean Herbert
bfc17bf4c0 Add taiko hit target skinning 2020-04-21 19:06:43 +09:00
Dean Herbert
bfc0d41c0c Add tick skinning support 2020-04-15 19:24:50 +09:00
Dean Herbert
07632cd1e5 Remove unnecessary container logic 2020-04-15 18:44:12 +09:00
Dean Herbert
3137417994 Add drumroll skinning 2020-04-15 18:03:23 +09:00
Dean Herbert
45d88b70f8 Split out base logic from LegacyHit into LegacyCirclePiece 2020-04-15 18:03:23 +09:00
Dean Herbert
3d5a622db7 Tidy up comments 2020-04-11 15:04:58 +09:00
Dean Herbert
63ebb7f80c Add support for taikobigcircle and fix exception on missing layers 2020-04-11 15:02:50 +09:00
Dean Herbert
96bf86099c Fix scaling of strong hits 2020-04-11 14:43:57 +09:00
Dean Herbert
dc56be0a1d Add support for skinned hits 2020-04-11 14:23:13 +09:00
Dean Herbert
d786a2c5b3 Add alignment support for skin versions older than 2.1 2020-04-08 19:42:31 +09:00
Dean Herbert
40267cb1fe Add test sprites and make alignment initially better 2020-04-08 19:42:31 +09:00
Dean Herbert
d896d5a231 Rename filename to match class 2020-04-03 18:51:34 +09:00
Dean Herbert
0a7d9b930c Add osu!taiko legacy drum skinning support 2020-04-03 18:23:03 +09:00
smoogipoo
0f8a76afde Remove manual hitobject sample namespacing 2020-01-02 14:27:27 +09:00