369 Commits

Author	SHA1	Message	Date
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
Tim Oliver	b471a240cc	Fixed merge typo in playfield members	2020-04-23 16:59:56 +08: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	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	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
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
Dean Herbert	bfc17bf4c0	Add taiko hit target skinning	2020-04-21 19:06:43 +09:00
Tim Oliver	c30ea2ec29	Added content proxying to drull roll elements	2020-04-08 12:46:02 +08:00
Tim Oliver	b883586add	Added logic to allow strong notes	2020-04-08 12:46:02 +08:00
Tim Oliver	7751c5e3aa	Added separate scrolling track to display drum roll notes	2020-04-08 12:46:02 +08:00
Dean Herbert	0a7d9b930c	Add osu!taiko legacy drum skinning support	2020-04-03 18:23:03 +09:00
Dean Herbert	388cf5c83a	Fix catch positional data being incorrectly recorded	2020-03-24 15:38:54 +09:00
Dean Herbert	96a849f897	Add remaining replay recorders	2020-03-24 14:55:49 +09:00
smoogipoo	5106d275ca	Remove CentreHit/RimHit hitobject abstraction	2020-03-23 12:08:15 +09:00
smoogipoo	7b2f58eb30	Apply OnRelease method signature refactorings	2020-01-22 13:22:34 +09:00
smoogipoo	49bf8d27d1	Move CreateScoreProcessor() to Ruleset	2019-12-17 20:08:13 +09:00
smoogipoo	5861eca80d	Make DrawableRuleset take a converted beatmap	2019-12-12 15:58:11 +09:00
smoogipoo	48f1dad4aa	Remove abstract ScoreProcessor class	2019-12-11 17:25:06 +09:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Bartłomiej Dach	9323df26a1	Decouple bar line hitobjects from generator ... Introduce an IBarLine interface, which together with generic constraints helps decouple BarLineGenerator from the actual hitobject types it creates. Thanks to this, all rulesets that want bar lines can provide an implementation of IBarLine that also derives from the base hitobject class. This allows DrawableBarLines in taiko and mania to be migrated back to DrawableTaikoHitObject and DrawableManiaHitObject base classes respectively. This in turn resolves #6215 without code duplication, since the missing anchoring application is now done in mania's DrawableBarLine through deriving from DrawableManiaHitObject.	2019-09-25 00:36:27 +02:00
Dean Herbert	af3bb5a2cd	Centralise and share bar line generation code between rulesets	2019-09-10 13:30:54 +09:00
Dean Herbert	40c61894ef	Update some case sensitive resources lookups in-line with resources	2019-09-04 10:44:24 +09:00
Dean Herbert	70e417533f	Update naming	2019-08-30 15:13:29 +09:00
smoogipoo	6ab2b20c70	Add an interface for working beatmaps	2019-08-29 19:38:44 +09:00
smoogipoo	7cc92e2fad	Make taiko proxy containers use LifetimeManagementContainer	2019-08-28 13:20:28 +09:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	42eaabe24c	Fix editor blueprints being misplaced ... Regressed with PlayfieldAdjustmentContainer changes.	2019-03-31 01:29:37 +09:00
Dean Herbert	14cef94a53	Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation	2019-03-29 12:59:26 +09:00
Dean Herbert	ed3746e166	Make PlayfieldAdjustmentContainer universal	2019-03-26 13:32:44 +09:00
Dean Herbert	9bf48863b0	Fix DrawableRuleset drawable creation method's name	2019-03-25 00:00:29 +09:00
Dean Herbert	7b6d882ce6	Remove double-generic type	2019-03-20 11:29:16 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	68f28326a2	Refactor RulesetContainer for readability	2019-03-19 20:21:31 +09:00
David Zhao	527b77b07d	Make all inheritors of drawablejudgement use new method	2019-03-12 19:52:44 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
smoogipoo	2ee181daf7	Re-namespace replay-related classes	2018-11-28 17:20:37 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
jorolf	41a0f9896e	Merge branch 'master' into flashlight-mod	2018-11-15 00:35:42 +01:00
jorolf	7d2958b7b0	split shader, remove unnecessary clutter and fix some bugs	2018-11-15 00:33:13 +01:00
smoogipoo	d8e7ad8241	Fix post-rebase issues	2018-11-12 17:36:19 +09:00
smoogipoo	10543cf1b6	Move rest of ScrollingPlayfield into ScrollingRulesetContainer	2018-11-12 17:34:35 +09:00
smoogipoo	ad45bc7666	Move scroll direction to scrollinginfo	2018-11-12 17:34:35 +09:00
smoogipoo	7f0f143a1b	Move IScrollAlgorithm to ScrollingRulesetContainer + use DI	2018-11-12 17:34:35 +09:00
smoogipoo	aee7a80e71	ScrollAlgorithm -> ScrollVisualisationMethod	2018-11-12 17:26:37 +09:00
jorolf	023924396d	Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time	2018-11-11 18:38:12 +01:00
smoogipoo	f66a9f4f1e	Rename IScrollChangeVisualiser -> IScrollAlgorithm	2018-11-08 14:04:21 +09:00
smoogipoo	70f1d17b7e	Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2018-10-16 17:28:16 +09:00
Dean Herbert	468f7fd1ea	Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework	2018-10-12 19:25:08 +09:00
Dean Herbert	e09e38148b	Merge branch 'master' into fix-scroll-speeds	2018-10-12 18:25:24 +09:00
smoogipoo	ff559a3a1b	Merge remote-tracking branch 'origin/master' into playfield-scaling-rework ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-10-05 10:40:16 +09:00
smoogipoo	d0007c047a	PlayfieldLayer -> PlayfieldAdjustmentContainer	2018-10-05 10:39:18 +09:00
smoogipoo	540a010fbb	Implement an intermediary EditRulesetContainer	2018-10-03 15:36:24 +09:00
Dan Balasescu	0f51007867	Merge branch 'master' into judgement-cleanup	2018-10-02 09:37:04 +09:00
smoogipoo	08bd363827	Adjust taiko scrolling speed	2018-10-01 18:15:55 +09:00
Kyle Chang	88b0c234cc	Move judgement text to internal container	2018-09-30 04:01:33 -04:00
smoogipoo	0bc2bcaf14	Remove GetAspectAdjustedSize() and PlayfieldArea	2018-09-21 15:14:49 +09:00
smoogipoo	368ceec47c	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00