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
Aaron Hong
ac17c047f6
Code formatting
2022-03-12 05:01:40 -08:00
Aaron Hong
848b005097
Remove unneccessary whitespace
2022-03-11 04:48:57 -08:00
Aaron Hong
35053eaeba
Show and hide osu!taiko touch controls overlay based on most recent input type detected
2022-03-11 04:43:57 -08:00
Aaron Hong
c33a661a49
osu!taiko touch implementation syntax formatting cleanup
2022-03-11 03:36:03 -08:00
Aaron Hong
1ed06f30e7
osu!Taiko touch implementation code cleanup
2022-03-11 03:33:03 -08:00
Aaron Hong
5ce57fa34a
Improve readability for getTaikoActionFromInput
2022-03-10 06:17:06 -08:00
Aaron Hong
317869078f
Basic functionality for Taiko touch input now complete
2022-03-10 05:09:07 -08:00
Aaron Hong
a25b6e6a09
Proof of Concept draft for Taiko touch input
2022-03-10 00:42:58 -08:00
Susko3
19467e58c1
Remove unused params from BDL methods
2022-01-15 01:06:39 +01:00
Dean Herbert
1eed2436e6
Clean up unused resolved properties
2021-12-03 18:49:49 +09:00
Dean Herbert
6944151486
Apply batch fixing of built-in types using var
2021-10-27 13:04:41 +09:00
Dean Herbert
32afd3f426
Replace all basic usages
2021-10-02 02:22:23 +09:00
smoogipoo
c9e76783e6
Fix taiko HD not calculating pre-empt correctly
2021-09-17 17:24:03 +09:00
smoogipoo
f9d5abff8a
Update with keybinding changes
2021-09-16 18:26:12 +09:00
Dean Herbert
b907c2f4f6
Fix osu! judgements getting scaled twice over different durations
2021-09-02 16:31:43 +09:00
Salman Ahmed
cea632463e
Remove empty newline
2021-08-26 22:30:20 +03: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
6bbc23c831
Merge pull request #14106 from smoogipoo/taiko-classic-mod
...
Make taiko classic mod emulate the classic "4:3" scroll speed
2021-08-02 22:22:26 +09:00
smoogipoo
9327bc169b
Make TaikoModClassic use classic-like scroll speed
2021-08-02 20:01:46 +09:00
smoogipoo
c023ce78d7
Match osu!stable taiko playfield size at 16:9
2021-08-02 18:48:32 +09:00
Dan Balasescu
791855dfa0
Merge branch 'master' into legacy-skin-default-fallback
2021-06-08 16:54:26 +09:00
Dean Herbert
273d66a0e0
Fix TaikoMascot
texture animation lookups
2021-06-08 00:42:34 +09:00
ekrctb
2c9e5b6c7e
Replace EntryCrossedBoundary
with more useful RemoveRewoundEntry
property
...
It can be used for dynamically added entries.
2021-06-03 15:00:16 +09:00
smoogipoo
0c3c8141da
Remove Expires and RemoveWhenNotAlive override
2021-03-18 19:39:42 +09:00
Bartłomiej Dach
72c18fbdfe
Restructure explosion animation to avoid resetting transforms on free
2021-03-15 21:21:52 +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
8f4dadb06a
Enable pooling for taiko judgements
2021-03-06 17:38:04 +01:00
Bartłomiej Dach
b24fc1922e
Enable pooling for taiko DHOs
2020-12-20 18:44:47 +01:00
Bartłomiej Dach
5d575d2a9b
Accept proxied content via OnNewDrawableHitObject
...
In the non-pooled case, `OnNewDrawableHitObject()` will be called
automatically on each new DHO via `Playfield.Add(DrawableHitObject)`.
In the pooled case, it will be called via `Playfield`'s implementation
of `GetPooledDrawableRepresentation(HitObject, DrawableHitObject)`.
2020-12-20 18:26:45 +01:00
Bartłomiej Dach
62da4eff37
Route new result callback via playfield
...
Follows route taken by osu! and catch (and required for proper pooling
support).
2020-12-20 18:26:45 +01:00
Bartłomiej Dach
ae6dedacaf
Implement nested strong hit application
2020-12-20 16:26:39 +01:00
Dean Herbert
88b3bf06e8
Merge branch 'master' into add-bundle-header
2020-12-16 13:40:15 +09:00
Bartłomiej Dach
5af1ac1b53
Rename TaikoStrong{-> able}HitObject
2020-12-14 21:46:02 +01:00
Bartłomiej Dach
7ba04a2cc3
Merge branch 'master' into taiko-strong-state-refactor
2020-12-14 21:44:50 +01:00
Dean Herbert
1793385e96
Pass a score to the replay recorder to allow reading more general scoring data
2020-12-14 16:52:14 +09:00
Bartłomiej Dach
ea09cbddc6
Register bar line pool & use in drawable ruleset
2020-12-13 22:31:33 +01:00
Bartłomiej Dach
a8e86a20e1
Unify bar line types & prepare for pooling
2020-12-13 22:31:33 +01:00
Bartłomiej Dach
beee9b89d5
Change bar line SHOC to nested playfield
2020-12-13 22:12:26 +01:00
Bartłomiej Dach
f74567e8eb
Introduce base class for hitobjects that can be strong
2020-12-13 12:36:39 +01:00
Dean Herbert
f29aa9c4fc
Move taiko barlines to their own ScrollingHitObjectContainer to avoid being considered as a selectable object
2020-11-27 14:35:12 +09:00
Dean Herbert
dc38aeac43
Remove unnecessary local definition of colour logic from taiko judgement
2020-11-16 17:23:02 +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
ed01d37966
Reintroduce KiaiHitExplosion as skinnable
2020-11-10 14:08:10 +01:00
Bartłomiej Dach
f245696947
Move {-> Default}KiaiHitExplosion
2020-11-10 13:24:32 +01:00
Dean Herbert
3ea27e23e8
Update namespace references
2020-10-29 15:20:10 +09:00
Dean Herbert
2a46f905ff
Remove unnecessary IsSeeking checks from taiko drum implementation
2020-10-05 14:27:51 +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
bad48d6d44
Merge branch 'master' into scoring-standardisation
2020-09-29 16:33:38 +09:00
smoogipoo
c45b5690cf
Use new hit results in taiko
2020-09-29 16:33:38 +09:00
Bartłomiej Dach
eb62ad4e55
Look up both sprites for legacy explosions
2020-09-27 16:06:59 +02:00
Bartłomiej Dach
deb207001a
Remove schedule causing default skin explosion regression
2020-09-27 15:23:34 +02:00
smoogipoo
480eeb5fbe
Add back caching
2020-09-25 19:37:34 +09:00
smoogipoo
acfa62bb50
Fix potential taiko crash on rewind
2020-09-25 19:25:58 +09:00
Bartłomiej Dach
4072abaed8
Allow miss explosions to be displayed
2020-09-20 19:40:30 +02:00
Bartłomiej Dach
1c7556ea5d
Schedule explosion addition to ensure both hits are processed
2020-09-20 19:40:30 +02:00
Bartłomiej Dach
074387c676
Show strong hit explosion where applicable
2020-09-20 19:40:30 +02:00
Bartłomiej Dach
8e6a0493b4
Adjust InputDrum usage
2020-07-26 17:50:25 +02: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
5db103dc61
Improve quality of taiko hit target
2020-06-29 14:42:20 +09:00
Dean Herbert
14ad3835ff
Update naming
2020-06-23 21:27:01 +09:00
Dean Herbert
c0e68f9854
Also support taiko drum
2020-05-21 11:08:06 +09:00
Dan Balasescu
f761c5e119
Merge branch 'master' into reposition-taiko-playfield
2020-05-14 19:37:05 +09: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
9ba1a8af88
Fix mascot getting stuck in clear state on rewind
2020-05-14 09:44:21 +09:00
Bartłomiej Dach
0933217389
Simplify mascot scaling
2020-05-13 18:53:47 +02:00
Bartłomiej Dach
942cc48e99
Improve mascot scaling
2020-05-12 20:26:11 +02:00
Dean Herbert
c04f2b0840
Reposition taiko playfield to be closer to the top of the screen
2020-05-12 15:51:59 +09:00
Dean Herbert
949e17cc0e
Rework scroller to support backwards playback
2020-05-12 15:23:47 +09:00
Bartłomiej Dach
e5821ff2b2
Integrate GameplayBeatmap changes
2020-05-11 22:53:05 +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
afcb45f28b
Move to playfield
2020-05-01 19:48:31 +09:00
Dean Herbert
8955b98cbb
Add basic taiko scroller implementation
2020-05-01 17:56:09 +09:00
Bartłomiej Dach
d021e213b2
Reword comment
2020-05-01 00:29:03 +02:00
Bartłomiej Dach
1e7b10320f
Adjust mascot positioning in playfield layout
2020-05-01 00:19:12 +02:00
Bartłomiej Dach
f5526890cc
Add comment about animation presence
2020-04-30 22:51:22 +02:00
Bartłomiej Dach
db4c8b2ba5
Fix transition out of clear state
2020-04-30 22:16:25 +02:00
Bartłomiej Dach
5cfc05e12a
Ensure correct initial state
2020-04-30 22:03:39 +02:00
Bartłomiej Dach
22fde8d2a0
Implement partial clear transition logic
2020-04-30 21:58:05 +02:00
Dean Herbert
49a98fde73
Move to non-legacy class
2020-04-30 09:57:14 +09:00
Dean Herbert
783dc58ef0
Move taiko additive blending locally to avoid applying to legacy skins
2020-04-30 09:41:56 +09:00
Bartłomiej Dach
b0e97793b6
Implement transitions into and from clear state
2020-04-30 00:14:27 +02:00
Bartłomiej Dach
0d917ca339
Ensure correct behaviour for clear animation
2020-04-29 21:52:09 +02:00
Bartłomiej Dach
9d6720e7e6
Scope up parameter
2020-04-29 21:30:13 +02:00
Bartłomiej Dach
e81d33dcec
Refactor mascot animations to split logic paths
2020-04-29 21:27:02 +02:00
Bartłomiej Dach
6e2ed0c4f3
Refactor mascot to only contain state transitions
2020-04-29 20:28:46 +02: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
Dean Herbert
84641765c5
Adjust exceptions and fix capitalisation
2020-04-28 11:08:19 +09:00
Craftplacer
6de6f068fd
Merge branch 'taiko-don' of https://github.com/Craftplacer/osu into taiko-don
2020-04-27 23:19:22 +02:00
Craftplacer
74d36cad78
Change state variables
2020-04-27 23:19:18 +02:00
Craftplacer
96660b2cca
Flip frame count check
2020-04-27 23:18:40 +02:00
Craftplacer
834eeb6d98
Reduce duplicate texture retrieval code
2020-04-27 23:18:26 +02:00
Craftplacer
9b3c1e4126
Remove unused bindables
2020-04-27 23:17:52 +02:00
Craftplacer
5caa4dedc2
Update osu.Game.Rulesets.Taiko/UI/DrawableTaikoMascot.cs
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 22:27:03 +02:00
Craftplacer
c049302650
Update osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 22:23:04 +02: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
52cf1e1859
Fix hit type not being provided and hit time offset not being considered
2020-04-27 16:48:27 +09:00
Dean Herbert
b9f28c8373
Combine hit types and remove old drumroll hits using a more efficient method
2020-04-27 16:13:28 +09:00
Dean Herbert
ff736a22dd
Fix typos in comment
2020-04-27 14:41:19 +09:00
smoogipoo
2630fc1405
Break instead of return for consistency
2020-04-27 12:27:43 +09:00
smoogipoo
7dc090cc24
Add support for hit explosions
2020-04-27 12:23:53 +09:00
smoogipoo
dd36b839b9
Refactor
2020-04-27 12:01:31 +09:00
Craftplacer
e830c7d833
Merge remote-tracking branch 'upstream/master' into taiko-don
2020-04-27 02:13:09 +02:00
Craftplacer
d46643ec52
Rework special case for strong hits
2020-04-27 02:10:12 +02:00
Craftplacer
dc6acf6ec9
Various code changes, fixes
2020-04-27 01:40:57 +02:00
Tim Oliver
c1c930c472
Fixed linting warnings
2020-04-25 13:47:20 +08:00
Tim Oliver
2a197db481
Merge branch 'master' into taiko-drumroll-party
...
# Conflicts:
# osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
2020-04-25 13:31:50 +08:00
Tim Oliver
3cc0b21eae
Added more smart checking to removing rewound drumroll hits
2020-04-25 13:18:02 +08:00
Craftplacer
364f5bf788
Update osu.Game.Rulesets.Taiko/UI/TaikoMascotTextureAnimation.cs
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-24 22:57:23 +02:00
Tim Oliver
477fe72fcf
Changed note playback to happen on new result
2020-04-25 00:15:59 +08:00
Dean Herbert
05b3db0147
Remove masking
2020-04-24 16:56:18 +09:00
Craftplacer
8ae119ab62
Fix last formatting error
2020-04-24 08:05:57 +02:00
Craftplacer
84aa37d7c3
Fix all local tests
2020-04-24 07:57:16 +02:00
Craftplacer
ac44185f09
Fix formatting
2020-04-24 07:09:20 +02:00
Craftplacer
dbf39be607
Decide on the name "Mascot", add testing, bug fixed, etc.
2020-04-24 06:59:05 +02:00
Craftplacer
bbe831698c
Remove unused code
2020-04-24 02:50:33 +02:00
Craftplacer
608596c3b3
Rename DefaultTaikoDonTextureAnimation to TaikoDonTextureAnimation
2020-04-24 02:50:10 +02:00
Tim Oliver
029d15f2a2
Fixed syntax warning for playfield children
2020-04-23 20:14:39 +08:00
Tim Oliver
1fa3764a1d
Cleaned up Update method in Taiko Playfield
2020-04-23 18:26:53 +08:00
Tim Oliver
dded4f8176
Fixed syntax warnings in Taiko playfield
2020-04-23 18:17:31 +08:00
Tim Oliver
a9897ba627
Moved proxy behaviour to drumroll container
2020-04-23 18:15:12 +08:00