1128 Commits

Author	SHA1	Message	Date
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	919b19612f	Add lookups for strong hit explosions	2020-09-20 19:40:30 +02:00
smoogipoo	847ec8c248	Fix n^2 characteristic in taiko diffcalc	2020-09-19 14:52:05 +09:00
smoogipoo	c62e4ef5e5	Allow one hitobject in taiko beatmap converter edge case	2020-09-18 13:06:41 +09:00
Dean Herbert	fdbd7b8a05	Merge branch 'master' into fix-taiko-endless-conversion	2020-09-17 22:31:35 +09:00
smoogipoo	c7d24203ce	Make beatmap conversion support cancellation tokens	2020-09-17 17:40:05 +09:00
smoogipoo	81f0a06fc4	Fix potential endless taiko beatmap conversion	2020-09-17 16:30:34 +09:00
Dean Herbert	7f2ce14f36	Merge pull request #9294 from smoogipoo/morth-taiko-changes	2020-09-15 16:11:17 +09:00
Bartłomiej Dach	a350802158	Fix wrong mono streak length handling in corner case	2020-09-10 20:50:26 +02:00
Bartłomiej Dach	6e5c5ab901	Fix invalid initial value of currentMonoLength	2020-09-10 18:22:49 +02:00
smoogipoo	74eea8900b	Remove unnecessary check for negative durations	2020-09-10 20:00:57 +09:00
Dean Herbert	ef44c7d063	Merge branch 'master' into score-recalc	2020-09-10 18:30:41 +09:00
smoogipoo	d700ae55fb	Merge branch 'master' into morth-taiko-changes	2020-09-10 16:34:09 +09:00
Dean Herbert	a65f564e45	Add icons for other ruleset editors	2020-09-09 18:40:01 +09:00
smoogipoo	117c7ec6b2	Merge branch 'master' into score-recalc	2020-09-09 14:38:36 +09:00
Dean Herbert	4680728b9c	Merge branch 'master' into update-dcc-exclusions	2020-09-07 18:01:44 +09:00
smoogipoo	1143d5d992	Update class exclusion for dynamic compilation	2020-09-04 20:41:08 +09:00
Dean Herbert	25e142965d	Strongly type and expose default beatmap information icon implementations for other rulesets	2020-09-04 15:01:32 +09:00
Dean Herbert	72cb65c22f	Update and add missing beatmap statistic icons to info wedge	2020-09-03 17:52:22 +09:00
smoogipoo	d387c0cba0	Merge branch 'master' into morth-taiko-changes	2020-09-03 17:35:26 +09:00
Dean Herbert	cd0a73883d	Merge pull request #9945 from smoogipoo/skin-colour-fix-2 ... Exactly reproduce osu!stable skin colour alphas	2020-08-29 20:06:26 +09:00
smoogipoo	1c1afa1c96	Move MaxCombo to base DifficultyAttributes	2020-08-28 19:16:20 +09:00
Bartłomiej Dach	43d6d2b2e8	Add back unstable rate display	2020-08-27 20:46:49 +02:00
Bartłomiej Dach	f152e1b924	Revert IStatisticRow changes	2020-08-27 20:13:44 +02:00
Bartłomiej Dach	05e725d59f	Add unstable rate statistic to rulesets in which it makes sense	2020-08-26 22:06:29 +02:00
Bartłomiej Dach	bbb3d7522e	Scope up return type to IStatisticRow	2020-08-26 19:24:12 +02:00
smoogipoo	2cf2ba8fc5	Store computed accent colour to local	2020-08-26 14:24:04 +09:00
smoogipoo	ab8d9be095	Move out into a separate method	2020-08-25 15:16:41 +09:00
Bartłomiej Dach	7c9fae55ad	Hopefully fix off-by-one errors	2020-08-22 22:50:58 +02:00
Bartłomiej Dach	5afe9b73d2	Fix invalid cref	2020-08-22 21:27:08 +02:00
Bartłomiej Dach	a080774799	Add xmldoc to taiko difficulty calculation code	2020-08-22 19:44:58 +02:00
Bartłomiej Dach	8ace7df0fd	Reorder members for better readability	2020-08-22 19:34:49 +02:00
Bartłomiej Dach	7e2bef3b9f	Split conditional for readability	2020-08-22 19:34:49 +02:00
Bartłomiej Dach	bcf3cd5657	Remove unnecessary yield iteration	2020-08-22 19:34:49 +02:00
Bartłomiej Dach	cb3fef7616	Inline same parity penalty	2020-08-22 19:34:49 +02:00
Bartłomiej Dach	ec99fcd7ab	Avoid passing down rhythm list every time	2020-08-22 19:34:49 +02:00
smoogipoo	9fbc5f3aeb	Update taiko with legacy colour setters	2020-08-22 00:23:08 +09:00
Bartłomiej Dach	27f97973ee	Add more proper typing to skills	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	cb5ea6aa9a	Generalise p-norm function	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	51d41515ef	Simplify expression with ternary	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	c827e21506	Extract helper method to reset rhythm strain	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	80e4c15727	Use Math.Clamp	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	ce0e5cf9a1	Slightly optimise and de-branch rhythm pattern recognition	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	d7ff3d77eb	Slightly optimise and de-branch repetition pattern recognition	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	00ae456f08	Remove unnecessary null check	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	c6a640db55	Remove superfluous IsRepeat field	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	f22050c975	Remove unnecessary initialiser	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	ff44437706	Extract method for marking cheese	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	292d38362c	De-nest cheese detection logic	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	6c759f31f1	Add and use limited capacity queue	2020-08-18 20:19:58 +02:00
Bartłomiej Dach	9fb494d5d3	Eliminate unnecessary loop	2020-08-18 17:36:23 +02:00
Bartłomiej Dach	cd2280b5bf	Fix cheese indexing bug	2020-08-18 17:36:21 +02:00
smoogipoo	8ded5925ff	Xmldoc colour strain	2020-08-13 13:47:35 +09:00
smoogipoo	5010d2044a	Replace IsKat with HitType	2020-08-13 01:35:56 +09:00
smoogipoo	d2a03f1146	Refactor TaikoDifficultyHitObject	2020-08-13 00:59:22 +09:00
smoogipoo	4c00c11541	Remove unnecessary change	2020-07-29 20:53:14 +09:00
smoogipoo	e09a5ac835	Merge branch 'master' into morth-taiko-changes	2020-07-29 20:52:54 +09: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
Dan Balasescu	2997fb3f4e	Merge pull request #9635 from peppy/perfect-mod-combo-objects-only ... Make perfect mod ignore all non-combo-affecting hitobjects	2020-07-23 20:54:39 +09:00
Dean Herbert	2c62b23d85	Update naming	2020-07-22 19:53:45 +09:00
Dean Herbert	c1442568b9	Make perfect mod ignore all non-combo-affecting hitobjects	2020-07-21 17:04:45 +09:00
Dean Herbert	648e414c14	Update InputHandlers in line with framework changes	2020-07-19 11:39:11 +09:00
smoogipoo	fc0f3f9171	Fix taiko drumroll bodies behaving badly with edge alphas	2020-07-17 16:55:01 +09:00
smoogipoo	c44ac9104f	Fix post-merge error	2020-07-17 14:19:43 +09:00
smoogipoo	98accf2777	Merge branch 'master' into morth-taiko-changes	2020-07-17 14:19:32 +09:00
Dean Herbert	5049977395	Merge pull request #9578 from smoogipoo/accuracy-based-mania	2020-07-16 16:12:48 +09:00
smoogipoo	87713215dc	Remove redundant parens	2020-07-16 14:30:17 +09:00
smoogipoo	35d6501478	Also adjust taiko	2020-07-16 14:13:46 +09:00
smoogipoo	dcd345eed9	Add a few tests	2020-07-16 01:35:38 +09:00
smoogipoo	0ea13dea55	Introduce legacy timing point fp errors	2020-07-13 17:06:00 +09:00
smoogipoo	352f59942e	Fix incorrect time delta in taiko strain	2020-07-13 16:50:54 +09:00
Dean Herbert	bd5957bc0a	Add dynamic compilation exclusion rules for ruleset types	2020-07-10 14:49:44 +09:00
smoogipoo	5db103dc61	Improve quality of taiko hit target	2020-06-29 14:42:20 +09:00
Dean Herbert	9119f41604	Merge branch 'master' into results-screen-statistics-overlapping-transition	2020-06-24 18:22:51 +09:00
Dean Herbert	14ad3835ff	Update naming	2020-06-23 21:27:01 +09:00
smoogipoo	988baad16f	Expand statistics to fill more of the screen	2020-06-22 19:20:43 +09:00
smoogipoo	261adfc4e6	Create a local playable beatmap instead	2020-06-22 18:38:41 +09:00
smoogipoo	33fdd7466c	Merge branch 'master' into results-screen-statistics-overlapping-transition	2020-06-22 15:38:48 +09:00
Bartłomiej Dach	ad85c5f538	Add base legacy skin transformer	2020-06-21 23:06:55 +02:00
smoogipoo	486b899e8f	Rename method	2020-06-19 22:11:29 +09:00
smoogipoo	83e6c3efdb	Adjust API for returning statistics	2020-06-19 20:31:52 +09:00
smoogipoo	68027fcc2c	Update with latest changes	2020-06-08 16:30:26 +09:00
Dean Herbert	61f906d9c4	Fix span piece being incorrect in some drag scenarios	2020-06-02 21:02:09 +09:00
Dean Herbert	665530f1c3	Remove excess newline	2020-06-02 17:22:59 +09:00
Dean Herbert	816f721f3d	Move selection blueprint to correct namespace	2020-05-30 15:24:44 +09:00
Dean Herbert	b068992a15	Add missing licence headers	2020-05-29 18:58:34 +09:00
Dean Herbert	e0aae15c0a	Hard type incoming ruleset	2020-05-29 16:45:47 +09:00
Dean Herbert	da289c474e	Split files out	2020-05-29 16:45:47 +09:00
Dean Herbert	7f8f41715d	Remove stray whitespace	2020-05-29 16:45:47 +09:00
Dean Herbert	7b52faa76d	Update override	2020-05-29 16:45:47 +09:00
Dean Herbert	3e973c176f	Remove unnecessary overrides	2020-05-29 16:45:47 +09:00
Dean Herbert	b2fad91589	Add swell and drumroll blueprints	2020-05-29 16:45:47 +09:00
Dean Herbert	dd7dbfd548	Rename to IHasDuration	2020-05-29 16:45:47 +09:00
Dean Herbert	534dccc0c3	Move sett from EndTime to Duration	2020-05-29 16:45:47 +09:00
Dean Herbert	a953f9e422	Add drum roll composition support	2020-05-29 16:45:47 +09:00
Dean Herbert	280b0adb1d	Split out IHasPath from IHasCurve to better define hitobjects	2020-05-29 16:45:47 +09:00
Dean Herbert	a2eec5d963	Fix strong bindable changes for DrumRolls	2020-05-29 16:45:47 +09:00
Dean Herbert	910326623c	Place rim hits using right mosue for now	2020-05-29 16:45:47 +09:00
Dean Herbert	50fcd4149f	Support Strong bindable changes	2020-05-29 16:45:47 +09:00
Dean Herbert	4e9631b546	Support HitType bindable changes	2020-05-29 16:45:47 +09:00
Dean Herbert	3487c1fd1b	Add menus to mark as rim and strong	2020-05-29 16:45:47 +09:00
Dean Herbert	4b1a2b5bc2	Fix offsets	2020-05-29 16:45:47 +09:00
Dean Herbert	90acba8c36	Introduce initial placement blueprint logic	2020-05-29 16:45:39 +09:00
Dean Herbert	7d4e60f05e	Add basic setup for TaikoHitObjectComposer	2020-05-29 16:45:39 +09:00
smoogipoo	bc35bc5efb	Merge branch 'master' into applydefaults-cancellation	2020-05-25 16:45:30 +09:00
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