1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:52:55 +08:00
Commit Graph

1771 Commits

Author SHA1 Message Date
OpenSauce04
3c13d64d1e Merge branch 'taiko-touch-ddkk-new' of https://github.com/OpenSauce04/osu into taiko-touch-ddkk-new 2023-01-10 19:21:06 +00:00
OpenSauce04
edd2084a0e Replaced all instances of TaikoInput with TaikoAction 2023-01-10 19:21:04 +00:00
OpenSauce
7cb5ca905a
Simplified getColourFromTaikoAction switch case
Co-authored-by: Stedoss <29103029+Stedoss@users.noreply.github.com>
2023-01-10 19:17:33 +00:00
OpenSauce
18e114904a
configTouchControlScheme is now read only
Co-authored-by: Stedoss <29103029+Stedoss@users.noreply.github.com>
2023-01-10 19:13:10 +00:00
OpenSauce04
21b617062a Removed an unnecessary newline 2023-01-10 16:24:02 +00:00
OpenSauce04
362c9050df Fixed OsuColour shenanigans 2023-01-10 15:08:18 +00:00
OpenSauce
b3e620c8e5 Removed unnecessary parameter 2023-01-10 13:07:07 +00:00
OpenSauce
bf555e4579 Removed unnecessary directives that were added automatically and I forgot to remove 2023-01-10 12:44:27 +00:00
OpenSauce
ffd6168a61 Removed unnecessary newlines 2023-01-10 12:13:51 +00:00
OpenSauce
906ea80d52 Further improved method of getting OsuColour 2023-01-10 12:11:33 +00:00
OpenSauce
a8f4f00421 Removed nullable 2023-01-10 12:04:06 +00:00
OpenSauce
4949b44888 Updated touch control scheme setting capitalization to be consistent with the rest of the settings menu 2023-01-10 11:57:21 +00:00
OpenSauce
b694e0d441 Added a comment and fixed some wonky formatting 2023-01-10 11:43:28 +00:00
OpenSauce
e3d14db285 Removed unnecessary QuarterCircle paramenters 2023-01-10 11:38:32 +00:00
OpenSauce
fd054081b8 Better name for touch control scheme config bindable 2023-01-10 11:30:52 +00:00
OpenSauce
3785dd0136 Taiko touch control scheme is now read from settings 2023-01-10 11:26:34 +00:00
OpenSauce
ee80cc988e Fixed drums not displaying correctly; Fixed typo on a function name 2023-01-10 10:32:00 +00:00
OpenSauce04
46ffded1db Taiko touch control scheme setting now *almost* works (need to implement getting control scheme from config); Drum display is incorrect 2023-01-10 08:27:21 +00:00
OpenSauce04
85396ba9d4 Added ruleset config stuff for Taiko; Added ruleset settings entry for Taiko touch control scheme 2023-01-09 19:26:43 +00:00
Dean Herbert
07eadba6d3
Merge pull request #21883 from sw1tchbl4d3r/allow_4_3
Allow aspect ratios smaller than the default in taiko
2023-01-09 16:30:19 +09:00
Dean Herbert
4a77105e78 Rename LockPlayfieldAspect and add comment explaining the change 2023-01-09 16:28:09 +09:00
Dean Herbert
98483d2a1b
Merge pull request #21638 from Mogiiii/touchscreen-control-disable-mouse
Disable touchscreen controls responding to mouse in scrolling gamemodes
2023-01-06 20:39:09 +08:00
sw1tchbl4d3
9021cf7be6 Allow aspect ratios smaller than the default in taiko 2022-12-28 11:42:34 +01:00
Berkan Diler
c7ca4bbba5 Use generic Enum methods 2022-12-26 20:36:39 +01:00
Dean Herbert
5e9fb1063a Move judgement text creation to base class and tidy things up 2022-12-24 12:22:36 +08:00
Dean Herbert
03603f8b54 Don't show great or higher judgements when using argon "pro" skin 2022-12-24 03:35:44 +08:00
Dean Herbert
727ac00f6d Combine base class for JudgementPiece 2022-12-24 03:32:13 +08:00
Dean Herbert
d6cae991da Update netstandard2.1 references to net6.0 2022-12-16 17:16:13 +09:00
Dylan Nantz
ee945c9b58 disable mouse input to touchscreen controls 2022-12-14 10:34:21 -05:00
Dean Herbert
2fd535ea20 Apply same immediate transform logic to TaikoLegacyPlayfieldBackgroundRight to fix it sticking during rewind 2022-12-02 17:33:18 +09:00
Dean Herbert
ebc75d40d2 Switch to using immediate transforms to make rewind handle better 2022-12-02 17:32:57 +09:00
Dean Herbert
47855de6ab Fix multiple issues with transform handling 2022-12-02 16:55:38 +09:00
Joppe27
a7f4325d3c Revert hacky fade value and fix test 2022-12-01 12:16:58 +01:00
Joppe27
f9a9ab1d9b Use BeatSyncedContainer and adjust values to be in line with stable 2022-11-30 19:50:47 +01:00
Joppe27
f3fa39f254 Add legacy taiko kiai glow element 2022-11-30 00:44:20 +01:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Dean Herbert
b381b4fd2d Merge branch 'master' into update-framework 2022-11-24 01:27:58 +09:00
Dean Herbert
23f91ec717
Merge pull request #21379 from Joppe27/taiko-animations-recovered
Add taiko hit overlay animations
2022-11-23 15:09:44 +09:00
Bartłomiej Dach
6e9d163c72
Specify canBeNull: true in [Resolved] for now 2022-11-22 20:56:07 +01:00
Bartłomiej Dach
ce7af0df63
Always use current timing point for circle piece animation
Using `LifetimeStart` seemed arbitrary and wrong not only in a
compatibility-with-stable sense, but also in a general sanity sense (why
would each object potentially be using a different timing point to
animate?)
2022-11-22 20:39:22 +01:00
Bartłomiej Dach
38f2a27f53
Split animation logic to its own method
Also add a guard, to bypass all of it if the foreground layer is not in
fact animatable.
2022-11-22 20:39:05 +01:00
Joppe27
5343f6922c Add legacy circle piece animations based on combo 2022-11-22 17:22:00 +01:00
Terochi
eff6c7be64 Removed unnecessary methods, changed tests, and moved LimitedCapacityQueue.cs to a more generic namespace. 2022-11-19 16:53:35 +01:00
Dean Herbert
06ce8130c2 Apply changes in line with framework NRT updates 2022-11-18 18:13:15 +09:00
Dean Herbert
45f47cce77 Add basic osu!taiko "argon" swell visual 2022-11-16 16:13:52 +09:00
Dean Herbert
233d45e185 Fix argon swells incorrectly flashing on every hit 2022-11-15 18:28:13 +09:00
Bartłomiej Dach
8b8147c321
Rename {catch -> taiko}Component 2022-11-12 03:05:03 +09:00
Bartłomiej Dach
6a4c97b4f1
Fix code inspection 2022-11-12 02:20:19 +09:00
Bartłomiej Dach
7ef11cab8b
Adjust taiko argon transformer to new naming 2022-11-12 02:10:10 +09:00
Bartłomiej Dach
7379f6fe20
Merge branch 'master' into argon-taiko 2022-11-12 01:56:30 +09:00
Dan Balasescu
fe58329478
Merge pull request #21151 from peppy/taiko-judgement-fixes
Fix various issues surrounding hit judgements
2022-11-11 16:41:46 +09:00
Dan Balasescu
8063dcd74a
Merge pull request #21148 from peppy/taiko-barline-separation
Move major barline portion to default implementation to allow for further customisation
2022-11-11 16:40:51 +09:00
Dan Balasescu
5bdbf56f43 Merge branch 'master' into taiko-judgement-fixes 2022-11-11 15:48:33 +09:00
Dan Balasescu
1a1a186d22 Merge branch 'master' into taiko-barline-separation 2022-11-11 15:47:06 +09:00
Dan Balasescu
f25a8ee4a6 Merge branch 'master' into taiko-tick-trackiung 2022-11-11 15:41:06 +09:00
Susko3
6303b88e56 Fix NRT causing CI failure 2022-11-10 14:31:24 +01:00
Dan Balasescu
606d42c679
Merge pull request #21184 from peppy/skinnable-things-cleanup
Skinnable class naming pass
2022-11-10 12:52:08 +09:00
Dan Balasescu
20520e7290
Merge pull request #21171 from peppy/unpollute-taiko-drawable-hit
Remove triangles skin specific implementation from base osu!taiko `DrawableHit`
2022-11-10 12:47:36 +09:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b Rename ISkinComponent to ISkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
20b8ab324f Apply nullability to osu!taiko skinning classes 2022-11-09 13:37:06 +09:00
Dean Herbert
30890644a8 Flash piece when hit 2022-11-08 15:31:45 +09:00
Dean Herbert
aa7d0e2c96 Remove triangles skin specific implementation from base DrawableHit 2022-11-08 15:22:00 +09:00
Dean Herbert
01803c3f13 Adjust judgement text to be more visible 2022-11-08 15:08:52 +09:00
Salman Ahmed
3af48352c9 Fix taiko major barlines no longer rendering correctly 2022-11-08 04:05:06 +03:00
Dean Herbert
d57ec4b227 Add argon input drum implementation 2022-11-07 18:32:12 +09:00
Dean Herbert
b15d1bc333 Add argon result display implementation 2022-11-07 18:32:12 +09:00
Dean Herbert
d5c375b139 Add argon hit explosion implementation 2022-11-07 18:32:12 +09:00
Dean Herbert
37cb187d2e Move strong hit scale to DefaultHitExplosion 2022-11-07 18:32:12 +09:00
Dean Herbert
e2046791c2 Add argon drum roll ticks 2022-11-07 18:32:12 +09:00
Dean Herbert
aa61eb8f4b Add note about taiko pooling oversight 2022-11-07 18:32:12 +09:00
Dean Herbert
938a8f865b Adjust transform of taiko drum roll ticks to not scale to 0 (looks bad) 2022-11-07 18:32:12 +09:00
Dean Herbert
f1556c98e3 Add drum roll implementation 2022-11-07 18:32:12 +09:00
Dean Herbert
6636545195 Move taiko argon hit icon to respective centre/rim pieces 2022-11-07 18:32:12 +09:00
Dean Herbert
529e3217cf Add barline implementation 2022-11-07 18:32:12 +09:00
Dean Herbert
f1a1f29da7 Add hit target implementation 2022-11-07 18:32:12 +09:00
Dean Herbert
421bdd2c1a Add playfield background implementations 2022-11-07 18:32:12 +09:00
Dean Herbert
bc0e9375af Add basic argon hits 2022-11-07 18:32:12 +09:00
Dean Herbert
baf8db8de4 Add basic setup for taiko argon skinning 2022-11-07 18:32:12 +09:00
Dean Herbert
2648175275 Merge branch 'taiko-barline-separation' into taiko-fixes-combined 2022-11-07 18:32:09 +09:00
Dean Herbert
688f50e086 Merge branch 'taiko-tick-trackiung' into taiko-fixes-combined 2022-11-07 18:32:07 +09:00
Dean Herbert
564d078517 Fix much brokenness with kiai and justment sizing 2022-11-07 17:19:32 +09:00
Dean Herbert
8745c2f016 Split out taiko DefaultJudgementPiece and move animations across 2022-11-07 17:19:32 +09:00
Dean Herbert
1975385cc7 Move first tick tracking logic inside TickPiece 2022-11-07 15:26:34 +09:00
Dean Herbert
c69a4f9333 Move major barline portion to default implementation to allow for further customisation
Of note, this removes the "major" barline triangles from legacy skins. I
think this is more correct, as they did not display in stable.
2022-11-07 14:29:58 +09:00
Dan Balasescu
a2b4e5b658
Merge pull request #20558 from vunyunt/stamina-available-fingers
Basic tl-tapping consideration for stamina
2022-11-07 09:55:54 +09:00
Dan Balasescu
819027d61c Rename to isConvert 2022-11-04 16:17:49 +09:00
Dan Balasescu
993439d30b Fix missed nullability 2022-11-03 11:28:39 +09:00
Dean Herbert
bfa5d41d89 Fix one more case 2022-11-02 17:39:45 +09:00
Dan Balasescu
5dfaf27722 A bit more cleanup 2022-11-02 17:23:45 +09:00
Dean Herbert
bc3382f373 Apply NRT to many taiko classes 2022-11-02 17:15:25 +09:00
Dean Herbert
910dd3ad01 Move more default classes to correct namespace 2022-11-02 17:15:25 +09:00
Dean Herbert
2407eb063d Simplify Circle usage in default CentreHitCirclePiece 2022-11-02 17:15:25 +09:00
Dean Herbert
9c758e5425 Move DefaultInputDrum to correct location 2022-11-02 17:15:25 +09:00
Dan Balasescu
5448c0209e Rename var 2022-11-02 10:14:40 +09:00
Dan Balasescu
9065cb0526 Merge branch 'master' into stamina-available-fingers 2022-11-01 13:05:25 +09:00
Dan Balasescu
4342521bc1 Merge branch 'master' into stamina-available-fingers 2022-10-28 13:07:48 +09:00
Dan Balasescu
707b9eaa50 Remove unnecessary null-forgiving 2022-10-28 13:07:44 +09:00
sw1tchbl4d3
446a9c1b05 Make added effect points inherit previous effect point settings 2022-10-27 23:41:17 +02:00
sw1tchbl4d3
93ffe3d7ad Revert to first approach 2022-10-27 07:25:50 +02:00
Bartłomiej Dach
974f22dd97
Attempt to make flashlight code slightly more legible 2022-10-25 20:15:19 +02:00
Bartłomiej Dach
e3bc1126d7
Fix invalid flashlight size calculation
This regressed in #20714. One usage of `getSizeFor(0)` was replaced by
`adjustSize(GetSize())`, but another usage of `getSizeFor(Combo.Value)`
was replaced by `adjustSize(Combo.Value)`, which is not correct, since
`adjustSize()` is expecting to receive a combo-based size, rather than a
combo value directly.
2022-10-25 20:03:22 +02:00
Bartłomiej Dach
93e9b4a2c5
Add failing test case 2022-10-25 20:02:28 +02:00
Dean Herbert
995216cced
Merge pull request #20819 from Joppe27/taiko-kiai-flashing
Implement taiko hitobject kiai flashing
2022-10-24 15:31:13 +09:00
cdwcgt
f14d871f97
let TaikoSpan show in timeline before placed 2022-10-23 01:32:22 +09:00
cdwcgt
a74e873b98
remove useless using 2022-10-23 01:13:29 +09:00
Dean Herbert
d441e98af7 Adjust kiai flash period in line with stable 2022-10-21 15:34:25 +09:00
cdwcgt
42bb9dc3e3
revert EndPlacement change 2022-10-20 22:17:26 +09:00
Joppe27
d83c398b58 Apply review: changed DelayUntilTransformsFinished to ArmedState check 2022-10-19 23:31:23 +02:00
Joppe27
9b123e7365 Adjust flash intensity and fade values to feel better 2022-10-19 00:51:44 +02:00
Joppe27
003e4247f9 Implement kiai flashing for "triangles" taiko skin 2022-10-18 23:55:40 +02:00
Joppe27
a21acdb5bc Implement kiai flashing for legacy taiko skins 2022-10-18 23:55:02 +02:00
cdwcgt
d6ed561280
make EndPlacement virtual 2022-10-19 00:31:21 +09:00
cdwcgt
3b1769c54e
Merge branch 'master' into taiko-compose 2022-10-19 00:00:20 +09:00
Dean Herbert
8bf4ca4b53 Add legacy skin fallback when beatmap skin is providing resources 2022-10-12 17:47:20 +09:00
Salman Ahmed
84fdd2e107 Improve flashlight display on break periods 2022-10-11 17:16:57 +03:00
vun
122064d03f Minor refactoring to reduce amount of looping 2022-10-09 07:09:05 +08:00
Dan Balasescu
bce20e0a59 Merge branch 'master' into adjust-flashlight 2022-10-07 14:45:30 +09:00
Dan Balasescu
5f3b58b7e0 Adjust taiko flashlight to closely match classic 2022-10-07 14:44:45 +09:00
Dan Balasescu
234c6ac799 Pin taiko PP calculator accuracy to osu-stable values 2022-10-05 20:21:15 +09:00
vun
47781a8f94 Fix code inspect issues and SR test cases 2022-10-03 17:31:45 +08:00
vun
25976e1f10 Correct xmldocs 2022-10-03 14:20:01 +08:00
vun
c933b62df6 Correct xmldoc 2022-10-03 14:16:53 +08:00
Jay L
6752655b5a xml, remove speedbonus cap 2022-10-02 16:08:14 +10:00
Jay L
4b562f782f decrease finger count 2022-10-02 15:28:39 +10:00
Jay L
a276e40033 reintroduce fl bonus to converts 2022-10-02 09:05:58 +10:00
vun
e6093f94df Apply nerfs to HD/FL bonuses with converts 2022-09-30 20:56:16 +08:00
vun
02092ede64 Refactor previous and next colour change into TaikoDifficultyHitObjectColour 2022-09-30 11:42:48 +08:00
vun
09a38fec94 Implement mono tl nerf for stamina, disable convert specific nerfs 2022-09-30 09:10:56 +08:00
vun
d84c956af9 Refactor to move first-object detection to evaluation 2022-09-29 15:27:26 +08: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
cdwcgt
344015a6e6
do not move timeline when EndPlacement 2022-09-27 20:12:40 +09:00
cdwcgt
9c4ae768f1
show object in timeline before placed
just BeginPlacement()
2022-09-27 20:08:32 +09: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
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
2f91b5c846 Add missing import. 2022-09-10 10:46:10 +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
Dan Balasescu
a2f8ff825e Also ignore drum roll strong judgement 2022-09-06 23:26:25 +09:00
Dan Balasescu
792b410c04 Merge branch 'master' into classic_drumrolls 2022-09-06 16:29:45 +09: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
sw1tchbl4d3
a9aa928ce6 Fix test, make strong hits have LargeBonus judgement 2022-08-30 15:00:46 +02:00
sw1tchbl4d3
b185194d07 Apply comments by smoogi 2022-08-30 14:44:44 +02:00
Dan Balasescu
e3e204001e
Merge pull request #19907 from peppy/ruleset-api-versioning
Add ruleset API versioning
2022-08-29 18:50:01 +09:00
Dean Herbert
a215d009fe Update Remove/RemoveRange/RemoveAll calls in line with framework changes 2022-08-29 15:57:40 +09:00