970 Commits

Author	SHA1	Message	Date
smoogipoo	5852a37eb7	Update with latest changes	2020-05-24 11:48:56 +09:00
smoogipoo	9461097b00	Update with latest changes	2020-05-22 20:50:21 +09:00
smoogipoo	d04da46522	Merge branch 'master' into morth-taiko-changes	2020-05-22 20:48:04 +09:00
Dean Herbert	c0e68f9854	Also support taiko drum	2020-05-21 11:08:06 +09:00
Dean Herbert	db4e3047dd	Add test for final sample output	2020-05-19 23:28:13 +09:00
Dean Herbert	e9710b6f83	Add taiko type conversion test coverage	2020-05-19 09:43:05 +09:00
Dean Herbert	013683c23b	Fix taiko rim markers incorrectly playing as whistle samples	2020-05-19 00:17:13 +09:00
smoogipoo	1865cd0762	Fix possible exceptions in performance calculators	2020-05-18 15:10:59 +09:00
smoogipoo	6534510999	Use cancellation token in taiko swell/drumroll	2020-05-15 19:25:14 +09:00
smoogipoo	98125102a7	Add cancellation token support to CreateNestedHitObjects()	2020-05-15 18:07:41 +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
Dean Herbert	6f2cc23a43	Merge branch 'master' into taiko-don	2020-05-13 19:27:54 +09:00
Dean Herbert	00efeb7cc6	Fix spawning too many sprites due to not yet populated sizing	2020-05-13 19:19:58 +09:00
Bartłomiej Dach	942cc48e99	Improve mascot scaling	2020-05-12 20:26:11 +02: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	c04f2b0840	Reposition taiko playfield to be closer to the top of the screen	2020-05-12 15:51:59 +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
Bartłomiej Dach	e5821ff2b2	Integrate GameplayBeatmap changes	2020-05-11 22:53:05 +02:00
Dean Herbert	77041bdbb5	Move implementation to DrawableHit to avoid "breaking" legacy encoding	2020-05-11 16:29:50 +09:00
smoogipoo	b0ed39f32b	Do not use statics	2020-05-11 14:57:47 +09:00
smoogipoo	779af48802	Resolve errors + auto-format	2020-05-11 14:53:42 +09:00
smoogipoo	d613888803	Add initial changes	2020-05-11 14:50:02 +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	b4d790c076	Fix taiko sample mapping for strong hits	2020-05-11 12:53:54 +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	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
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	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
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
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	ca055581af	Fix taiko hit target alpha on legacy skins	2020-04-27 18:18:11 +09: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
Dean Herbert	1cd4fd2ac4	Merge branch 'master' into taiko-drumroll-party	2020-04-27 13:27:10 +09:00
smoogipoo	20ae973e4a	Use max result instead of GOOD	2020-04-27 12:29:11 +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
Dean Herbert	4ca7ce7715	Merge branch 'master' into taiko-barline-skinning	2020-04-25 18:58:44 +09: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
Tim Oliver	2be3a8184d	Removed modifications to drum roll object	2020-04-25 00:15:37 +08:00
Dan Balasescu	b3175f9dfa	Merge branch 'master' into taiko-playfield-background-skinning	2020-04-24 19:27:38 +09: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	6de08db653	Add removed skin component back	2020-04-24 02:50:47 +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	c059588a09	Removed un-needed unproxy method	2020-04-23 18:26:40 +08:00
Tim Oliver	dded4f8176	Fixed syntax warnings in Taiko playfield	2020-04-23 18:17:31 +08:00
Tim Oliver	f1ae8af581	Removed un-needed using directives	2020-04-23 18:16:05 +08:00
Tim Oliver	a9897ba627	Moved proxy behaviour to drumroll container	2020-04-23 18:15:12 +08:00
Tim Oliver	b471a240cc	Fixed merge typo in playfield members	2020-04-23 16:59:56 +08: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	f804be25d1	Remove incorrect area sizing (now using fillmode / relative instead)	2020-04-23 13:39:44 +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	2e022fbcb5	Add comment about padding update computation	2020-04-23 12:49:53 +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	58bf288595	Remove DrawableHit's custom sizing logic ... Turns out this was unnecessary and never actually being used.	2020-04-23 12:17:52 +09:00
Dean Herbert	ca56e6c0d2	Rename taiko HitTarget classes to avoid conflict with mania	2020-04-23 12:11:30 +09:00
Tim Oliver	81c51f0661	Merge branch 'master' into taiko-drumroll-party ... # Conflicts: # osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs # osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs	2020-04-22 23:15:48 +08:00
Tim Oliver	2600518b1b	Moved drumroll container and removed rewound notes	2020-04-22 22:50:00 +08:00
Tim Oliver	26779a57b4	Exposed public ability to unproxy content	2020-04-22 22:49:30 +08: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
Tim Oliver	44405d4771	Moved result to load complete for flying hits	2020-04-22 15:50:23 +08:00
smoogipoo	ba12e23d9e	Fix inspection	2020-04-22 09:06:04 +09:00
smoogipoo	d8fdd73e17	Implement IHasCurve on DrumRoll	2020-04-22 09:06:04 +09:00
Dean Herbert	bfc17bf4c0	Add taiko hit target skinning	2020-04-21 19:06:43 +09:00
Tim Oliver	5b4f69bb8c	Moved flying hit objects to separate files	2020-04-20 13:32:51 +08:00
Dean Herbert	58a1c6e171	Reapply taiko visibility hack at a higher level	2020-04-17 19:52:58 +09:00
Dean Herbert	f36477e39d	Add back "filled" property setting	2020-04-16 10:04:09 +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	eb165840cb	Add remaining taiko hitobject skinnables and expose as SkinnableDrawable for safety	2020-04-15 18:03:23 +09:00
Andrei Zavatski	f4b5a17b65	Fix typo in DrawableTaikoHitObject	2020-04-15 07:00:38 +03:00
Dean Herbert	c3f0475748	Make CirclePiece abstract	2020-04-12 17:40:22 +09:00
Tim Oliver	412ac6121f	Merge branch 'master' into taiko-drumroll-party	2020-04-12 15:36:07 +08:00
Tim Oliver	162a85042a	Removed un-needed using	2020-04-12 10:38:22 +08:00
Tim Oliver	3ad36c7b84	Moved flying objects to use ignore hit judgements	2020-04-11 17:20:52 +08:00
Tim Oliver	1c0ad13d82	Added ignore hit object	2020-04-11 17:20:37 +08: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	009b138364	Prepare for skinnable versions	2020-04-11 14:19:59 +09:00
Dean Herbert	78db83fd0e	Remove TaikoPiece class and localise kiai for now	2020-04-11 14:19:59 +09:00
Dean Herbert	7fba291134	Change inheritance of taiko hit pieces to better allow for skinning	2020-04-11 13:33:49 +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