1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 18:53:51 +08:00
Commit Graph

1835 Commits

Author SHA1 Message Date
Dan Balasescu
15f6bc155e Add progressive score multiplier for HT 2023-04-10 13:35:48 +09:00
Dan Balasescu
c923482976 Add progressive score multiplier for DT 2023-04-10 13:31:48 +09:00
Bartłomiej Dach
7d9327f3e2
Only allow hit placement when left mouse is clicked 2023-04-04 18:40:10 +02:00
Bartłomiej Dach
f42a463479
Remove #nullable disable
May as well that we're here...
2023-04-03 20:14:17 +02:00
Bartłomiej Dach
ed07c0640b
Remove unused using directive 2023-04-03 20:13:59 +02:00
Dean Herbert
be79ea1c10 Remove left/right click based placement in taiko editor and respect sample selection 2023-04-03 18:14:58 +09:00
Dan Balasescu
9866321d27
Merge branch 'master' into taiko-single-tap 2023-03-09 13:24:20 +09:00
Bartłomiej Dach
430b09acb2
Expose taiko input manager in same manner as osu! 2023-03-08 22:52:06 +01:00
OpenSauce04
b2d453fd2e Fixed indentation 2023-03-06 11:44:00 +00:00
OpenSauce04
36108ea841 Moved CheckValidNewAction checks into checkCorrectAction 2023-03-06 11:11:38 +00:00
OpenSauce04
4ae2661f1b Removed useless null checks 2023-03-06 11:00:37 +00:00
OpenSauce04
ac6c8e600a Updated a comment for correctness 2023-03-06 10:59:47 +00:00
OpenSauce04
a7be59175d Made private + renamed Taiko Single Tap tracking variables for better readability 2023-03-06 10:59:22 +00:00
OpenSauce04
50b0fca264 Code formatting 2023-03-03 18:11:29 +00:00
OpenSauce04
865f785f50 Fixed an issue where Taiko's Single Tap could allow alternation under very specific circumstances 2023-03-03 17:13:39 +00:00
OpenSauce04
d4bb08a440 Fixed CodeInspector complaining 2023-02-28 18:38:09 +00:00
OpenSauce04
0a76c8ee7f Further simplified a type check 2023-02-28 15:41:06 +00:00
OpenSauce04
8851da05f1 Merge branch 'taiko-single-tap' of https://github.com/OpenSauce04/osu into taiko-single-tap 2023-02-28 15:37:54 +00:00
OpenSauce04
616f7b3f64 Simplified a type check 2023-02-28 15:37:46 +00:00
OpenSauce
781da032e9
Merge branch 'master' into taiko-single-tap 2023-02-28 15:22:41 +00:00
OpenSauce04
3aa8c81c5d Added missing mod incompatabilities 2023-02-28 15:20:53 +00:00
OpenSauce04
7c84a84fbe Removed TaikoInputBlockingMod, and instead moved code into TaikoModSingleTap 2023-02-28 15:14:03 +00:00
Dean Herbert
044b0604b2 Move OmitFirstBarLine to TimingControlPoint 2023-02-28 19:29:31 +09:00
OpenSauce04
beb04379f9 Inverted an if statement for code clarity 2023-02-27 22:36:09 +00:00
OpenSauce
8d747f2402
Fixed grammar mistake in Taiko Relax mod description 2023-02-27 16:06:33 +00:00
OpenSauce
25ef1f199d
Update description for Taiko Single Tap mod 2023-02-27 15:22:06 +00:00
OpenSauce04
12a2037086 Removed useless TaikoAction check from TaikoInputBlockingMod 2023-02-27 14:39:12 +00:00
OpenSauce04
d823faed08 Remove unused flash_duration const 2023-02-27 14:33:47 +00:00
OpenSauce04
dd9194b976 Code formatting fix 2023-02-27 13:58:40 +00:00
OpenSauce04
12b983495c Fixed issues caused by branch being stale 2023-02-27 13:40:55 +00:00
OpenSauce04
f2cada4584 Strong drumrolls no longer allow all actions to be used 2023-02-27 13:18:08 +00:00
OpenSauce04
b883c6af34 Renamed all instances of Taiko's InputBlockingMod to TaikoInputBlockingMod 2023-02-27 13:18:08 +00:00
OpenSauce04
715df42a69 Strong hits are now allowed to be hit 2023-02-27 13:18:08 +00:00
OpenSauce04
17a05de107 Initial Taiko single tap implementation (still needs code to allow for Strong hits) 2023-02-27 13:18:08 +00:00
Dean Herbert
da8ab7143b
Merge branch 'master' into maximum-judgement-offset-in-hit-object 2023-02-15 14:48:15 +09:00
Bartłomiej Dach
67b6df3172
Reword ambiguous xmldoc 2023-02-12 13:31:29 +01:00
Dean Herbert
9d09141ab7 Move taiko-specific property out of DrawableHitObject 2023-02-12 16:09:28 +09:00
Dean Herbert
ad8b01b478
Merge pull request #22589 from sw1tchbl4d3r/file_hitsample_additions
Always add to additions soundbank in `convertSoundType`
2023-02-10 17:14:29 +09:00
sw1tchbl4d3
51816b92c6 Add conversion tests 2023-02-09 23:23:58 +01:00
sw1tchbl4d3
2e2ab4081b Make LargeBonus a valid HitResult in taiko 2023-02-09 21:22:34 +01:00
Dean Herbert
34d1890f1c Change snapping to only apply to classic mod 2023-02-09 18:22:14 +09:00
OpenSauce
df1355ea4b Taiko hit objects now snap to hit target 2023-02-08 10:59:08 +00:00
Bartłomiej Dach
11685d427a
Merge branch 'master' into taiko-touch-ddkk-new 2023-02-04 21:54:38 +01:00
Dean Herbert
bc02fb0e32 Remove redundant parameter in DrumSegment constructor 2023-02-03 16:37:35 +09:00
Dean Herbert
ffbaf453f8 Revert misordered drawable order
This will completely change the visual appearance of this control... not
sure why it was changed.
2023-02-02 16:25:23 +09:00
Dean Herbert
eb62ba09aa Completely refactor to match project code standards 2023-02-02 16:23:27 +09:00
Dean Herbert
b182178340
Merge pull request #22325 from sw1tchbl4d3r/sv_scaling
Move fixed scroll speed change out of classic mod for taiko
2023-01-25 12:55:43 +09:00
sw1tchbl4d3
d4e5d7a873 Move fixed scroll speed change out of classic mod for taiko 2023-01-21 22:29:28 +01:00
ekrctb
11e1b22bf5 Move MaximumJudgementOffset to HitObject
We want to access this property for computing lifetime
2023-01-19 21:23:55 +09:00
Dean Herbert
70cb23bbc9
Merge branch 'master' into mod-accuracy-challenge 2023-01-17 16:46:54 +09:00
OpenSauce04
25a920732f Addressed code formatting issues 2023-01-12 19:04:37 +00:00
OpenSauce
92def3daf4 Renamed QuarterCircle class to DrumSegment 2023-01-12 18:20:03 +00:00
OpenSauce
f2ec0b2176 Made QuarterCircle property loading less clapped 2023-01-12 18:17:50 +00:00
OpenSauce
927fccb7be Taiko touch control scheme can now be changed mid-map 2023-01-12 17:55:05 +00:00
OpenSauce
767c3cb523 Revert "getTaikoActionFromDrumSegment and getColorFromTaikoAction are now run from within QuarterCircle constructor"
This reverts commit 985b126cba.
I really don't think this is going to work cleanly
2023-01-12 17:20:07 +00:00
OpenSauce04
985b126cba getTaikoActionFromDrumSegment and getColorFromTaikoAction are now run from within QuarterCircle constructor 2023-01-12 16:06:03 +00:00
OpenSauce
026a223129
Cleaner way of getting ForceControlScheme value
Co-authored-by: Susko3 <Susko3@protonmail.com>
2023-01-11 20:39:45 +00:00
OpenSauce04
a0ff03def3 Fixed some formatting 2023-01-11 20:06:43 +00:00
OpenSauce
32d1d5a34a Added tests for new Taiko touch control schemes 2023-01-11 12:04:52 +00:00
OpenSauce
944c6759d9
Fixed right rim being incorrectly layered above right centre 2023-01-10 23:13:22 +00:00
OpenSauce04
ce37760b27 Removed unnecessary coma 2023-01-10 20:05:41 +00:00
OpenSauce04
57467e7b39 Touchscreen drum now uses a 2d array rather than nested switches to get TaikoActions for control scheme 2023-01-10 20:04:57 +00:00
OpenSauce04
2b58862567 Added ArgumentOutOfRangeException throws 2023-01-10 19:31:31 +00:00
OpenSauce04
2800eeac56 Simplified formatting; Removed warning suppressors 2023-01-10 19:23:49 +00:00
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