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

469 Commits

Author SHA1 Message Date
Dean Herbert
e87cf6d256 Move all remaining osu!taiko sample playback logic out of DrawableHitObjects 2023-06-30 15:21:34 +09:00
OliBomby
608fa3cc73 Merge remote-tracking branch 'upstream/master' into sample-control-points 2023-04-30 19:47:03 +02:00
sw1tchbl4d3
76df5fd3e2 Limit taiko playfield aspect ratio to 5:4 - 16:9 2023-04-26 18:05:47 +02:00
OliBomby
d97daee96b remove all non-test usage of SampleControlPoint 2023-04-26 13:55:39 +02:00
Bartłomiej Dach
430b09acb2
Expose taiko input manager in same manner as osu! 2023-03-08 22:52:06 +01:00
OpenSauce04
12b983495c Fixed issues caused by branch being stale 2023-02-27 13:40:55 +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
sw1tchbl4d3
d4e5d7a873 Move fixed scroll speed change out of classic mod for taiko 2023-01-21 22:29:28 +01: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
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
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
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
Dylan Nantz
ee945c9b58 disable mouse input to touchscreen controls 2022-12-14 10:34:21 -05: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
06ce8130c2 Apply changes in line with framework NRT updates 2022-11-18 18:13:15 +09:00
Bartłomiej Dach
7379f6fe20
Merge branch 'master' into argon-taiko 2022-11-12 01:56:30 +09:00
Dan Balasescu
5bdbf56f43 Merge branch 'master' into taiko-judgement-fixes 2022-11-11 15:48:33 +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
Salman Ahmed
3af48352c9 Fix taiko major barlines no longer rendering correctly 2022-11-08 04:05:06 +03:00
Dean Herbert
37cb187d2e Move strong hit scale to DefaultHitExplosion 2022-11-07 18:32:12 +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
Dan Balasescu
993439d30b Fix missed nullability 2022-11-03 11:28:39 +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
9c758e5425 Move DefaultInputDrum to correct location 2022-11-02 17:15:25 +09:00
Dan Balasescu
a2f8ff825e Also ignore drum roll strong judgement 2022-09-06 23:26:25 +09:00
Dean Herbert
7baa1a7e85 Attempt to fix crashing from weird input interactions 2022-07-22 20:19:13 +09:00
Dean Herbert
ee5e27638e Fix method name not matching actual implementation 2022-07-22 18:19:33 +09:00
Dean Herbert
9e5e03af5d Adjust colours to match default skin for now 2022-07-22 18:16:01 +09:00
Dean Herbert
ec98693cca Add back standard mouse bindings support and only handle mouse when inside the visible zone 2022-07-22 18:09:19 +09:00
Dean Herbert
4279ac866c Tidy up unnecessary changes and remove unused classes 2022-07-22 17:58:52 +09:00
Dean Herbert
2d2d98ab6e Add final design pass 2022-07-22 17:53:25 +09:00
Dean Herbert
aeeedc40b4 Add first pass design 2022-07-22 17:17:38 +09:00
Dean Herbert
bd6ff40b43 Combine touch and mouse handling into single path 2022-07-22 17:03:08 +09:00
Dean Herbert
b604eb6262 Simplify implementation 2022-07-22 16:59:09 +09:00
Dean Herbert
7015cf0b1b Move touch input drum to own file for now 2022-07-22 16:39:26 +09:00
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
Dean Herbert
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
Bartłomiej Dach
26c5b59f6d
Replace usages of string.To{Lower,Upper}() 2022-06-24 11:57:45 +02:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Nostril
5cbd3bd67e
Merge branch 'ppy:master' into master 2022-06-08 19:29:14 -07:00
Dan Balasescu
8578f12a58 Fix taiko circle fills missing after rewind 2022-06-07 18:35:12 +09:00
Dean Herbert
859a83ac90 Remove unused field and fix typo 2022-06-02 14:48:26 +09:00
Dean Herbert
45adca17da Make DrumSamplePlayer a CompositeDrawable 2022-06-02 14:39:57 +09:00
Dean Herbert
f3d4cd3f95 Fix various code inspection issues 2022-06-02 14:36:07 +09:00
Aaron Hong
f6e9dfe7bf Fix naming rule violations 2022-06-01 01:03:21 -07:00
Aaron Hong
fcc05396bc Remove unused import 2022-06-01 00:57:24 -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
f48533b8a2 Inline input drum proxying logic 2022-04-13 04:38:41 +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
ec5ad995f8 Reorder taiko playfield elements to fix hit explosion Z-ordering 2022-04-06 02:37:57 +03:00
Salman Ahmed
e4f6e842b0 Expose input drum SkinnableDrawable in InputDrum for width consumption
This is probably not a good way to approach this, but I'm unsure about
any other way.
2022-04-06 02:35:00 +03:00
Salman Ahmed
ac32966427 Replicate osu!(stable)'s hit target position with "Classic" mod 2022-04-03 02:02:20 +03:00
Dean Herbert
2c47c4a2e9
Merge branch 'master' into taiko-classic-aspect-ratio 2022-03-14 10:40:35 +09:00
Salman Ahmed
4a8aa72d1b Nudge osu!taiko playfield's height to perfectly match with osu!(stable) 2022-03-14 01:03:08 +03:00
Salman Ahmed
0b74bde653 Disable taiko playfield aspect ratio lock on "Classic" mod 2022-03-13 08:21:58 +03:00
Aaron Hong
b628a65cfa Revert "Adjust default touch drum overlay size to be more comfortable on phones"
This reverts commit 2de6bb033b.
2022-03-12 08:03:24 -08:00
Aaron Hong
2de6bb033b Adjust default touch drum overlay size to be more comfortable on phones 2022-03-12 07:51:40 -08:00
Aaron Hong
9db80c3335 Code cleanup 2022-03-12 05:32:02 -08:00
Aaron Hong
6f99455d94 Improve centre input size fitting for legacy skins 2022-03-12 05:17:45 -08:00