444 Commits

Author	SHA1	Message	Date
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
Hanamuke	309d8c8cb4	CI	2018-09-19 18:43:39 +02:00
Hanamuke	e7d78b94ae	Remove ScrollingVisualisation from settings	2018-09-19 18:30:25 +02:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
smoogipoo	732dfde8ed	DrawableStrongHandler -> DrawableNestedStrongHit	2018-08-14 14:28:40 +09:00
smoogipoo	741ec0021e	Rename more judgement-related methods to "result"	2018-08-06 11:31:46 +09:00
smoogipoo	5fd4ed2f4e	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +09:00
smoogipoo	38263714a1	Cleanups	2018-08-03 16:56:46 +09:00
smoogipoo	e6775c7a16	Fix playfield display	2018-08-03 16:46:03 +09:00
smoogipoo	19c541dbf5	Migrate swells to use nested hitobjects for ticks	2018-08-03 16:35:29 +09:00
smoogipoo	a0887a600f	Fix swells showing hit circles on intermediate judgements	2018-08-02 21:08:06 +09:00
smoogipoo	9c2122c0ca	Make Rulesets.Taiko use the new judgement result structure	2018-08-02 20:36:19 +09:00
smoogipoo	1139f0dbf2	Centralise method of disabling playfield judgements	2018-07-20 17:04:33 +09:00
Dan Balasescu	64cde1ebad	Merge branch 'master' into use-switch-over-if	2018-07-17 16:44:57 +09:00
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +09:00
Dean Herbert	825941aff1	Use switch with type matching in place of if-else where possible	2018-07-17 14:35:09 +09:00
Roman Kapustin	2a72062c33	Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part.	2018-06-26 00:53:31 +03:00
Dean Herbert	d7133f059d	Fix incorrect implementation	2018-06-25 16:53:12 +09:00
nl-tatatat	09b2025fad	Update TaikoRulesetContainer.cs ... Remove code that I am almost 100% sure that makes barlines every 1/1 instead of 4/1.	2018-06-24 04:48:38 -05:00
smoogipoo	4575319102	Privatise the proxied content	2018-06-17 17:56:46 +09:00
smoogipoo	99ef44eca2	Merge remote-tracking branch 'origin/master' into fix-taiko-proxies	2018-06-17 17:54:50 +09:00
smoogipoo	22dfe46572	Make taiko hitobject properly unproxy when rewound	2018-06-11 21:46:45 +09:00
smoogipoo	8f3215f5a0	Make sure taiko hitexplosions expire and get removed	2018-06-11 20:42:04 +09:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	03a5df84c6	Initial rework of beatmap conversion process	2018-04-19 22:04:12 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
Dean Herbert	b62ed004f2	Remove judgements when deciding a new judgement for a HitObject ... Generally happens when rewinding.	2018-03-07 19:14:42 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28:14 +09:00
Dean Herbert	4a52df2dd4	Apply review	2018-02-24 23:07:02 +09:00
Dean Herbert	768e0a4e2a	Add SkinnableSound class ... Tidy things up, move logic out of SampleInfo.	2018-02-24 22:47:14 +09:00
smoogipoo	5faec5c2f1	Add a separate property to control playfield area	2018-02-21 20:54:33 +09:00
smoogipoo	cd2c9a9de6	Adjust xmldoc and rename to GetAspectAdjustedSize	2018-02-19 17:04:18 +09:00
smoogipoo	c309cc9454	Privatise OnJudgements as much as possible	2018-01-16 15:37:32 +09:00
smoogipoo	8c5ef0a330	Remove base OnJudgement from Playfield to properly accomodate nested playfields	2018-01-15 20:48:57 +09:00
smoogipoo	3a869edf36	Add a flag to disable user scroll speed adjustments	2018-01-11 12:44:39 +09:00
smoogipoo	86b5591583	Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite	2018-01-10 18:02:49 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	a7aab21a29	Re-namespace files	2018-01-04 19:22:15 +09:00
smoogipoo	651e24e3cc	Implement proper scrolling directions	2018-01-04 19:17:40 +09:00
smoogipoo	f34131f8f4	Initial game-wide replacement of scrolling playfields	2018-01-04 18:50:17 +09:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
Dean Herbert	3f73a9a693	Add better sample fallback logic ... Also adds support for null channels at InputDrum level.	2017-12-27 21:44:04 +09:00
smoogipoo	35d7fa8a81	Cleanup things that are now not needed with these changes	2017-12-26 14:18:38 +09:00
smoogipoo	14162b5d46	Make InputDrum handle all Normals/Claps, hitobjects all others	2017-12-26 14:18:23 +09:00
smoogipoo	affdd81563	Remove unused usings	2017-12-25 17:29:44 +09:00
smoogipoo	ac8b345bfe	Make TaikoPlayfield use the new DrumSampleMapping	2017-12-25 17:29:20 +09:00
Dean Herbert	cd8e8c8323	Actually save changes	2017-12-23 16:52:23 +09:00
Dean Herbert	a30400ad29	Use a class instead of Tuple	2017-12-23 16:49:29 +09:00
Dean Herbert	9ca03c0209	Simplify and tidy sample retrieval ... Less static weirdness	2017-12-23 16:46:02 +09:00
Dean Herbert	5026c7a95e	SoundControlPoint -> SampleControlPoint	2017-12-23 16:34:34 +09:00
FreezyLemon	4b3cf0773d	Various CI adjustments	2017-12-08 09:52:58 +01:00
FreezyLemon	61a6a2919e	Fixed multiple critical bugs and changed allSamples to a normal Dictionary for faster access	2017-12-08 09:41:13 +01:00
FreezyLemon	40e750f309	Added sample preloading and playing	2017-12-08 08:32:16 +01:00
FreezyLemon	229c9b5b4e	First basic implementation of IKeyBindingHandler for the playfield so it can handle taiko hitsounds	2017-12-07 23:11:34 +01:00
FreezyLemon	43c270ea49	Rolled back the bad earlier implementation	2017-12-07 21:18:51 +01:00
FreezyLemon	e3232dd754	Added if to ignore more (for our purposes) useless keydowns	2017-11-29 06:51:00 +01:00
FreezyLemon	c00fb47236	Added hitsound handling to the TaikoRulesetContainer so every KeyDown can play a hitsound (instead of the DrawableHitObjects)	2017-11-29 06:28:08 +01:00
smoogipoo	3f20caa543	Make taiko stop crashing for now	2017-11-02 23:31:50 +09:00
Dean Herbert	5d5ea5fb2e	Fix all remaining db structure issues	2017-10-19 14:05:11 +09:00
Dean Herbert	d5892cf54e	Add a bool to specify whether judgements should be visible for certain DrawableHitObjects	2017-10-09 20:17:05 +09:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
smoogipooo	093d82ac45	Set depths from playfield add methods instead of DrawableHitObject	2017-09-13 16:17:01 +09:00
smoogipooo	3ef65a1e5d	Cleanup TaikoPlayfield a bit	2017-09-12 18:49:31 +09:00
Dean Herbert	f32d444d68	Remove generics from Playfield (fixes catch)	2017-09-12 18:19:28 +09:00
Dean Herbert	1194e46ef1	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-12 17:46:21 +09:00
Dean Herbert	b01233eddc	Fix CI issues	2017-09-11 14:48:01 +09:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	ac8ec31b61	Make judgements able to be "added" plus make everything compile and run.	2017-09-06 17:02:13 +09:00
Dean Herbert	84c22df3f5	Combine Judgement.HitResults into one.	2017-09-06 17:01:48 +09:00
smoogipooo	68c7226d12	Fix cherry pick issues.	2017-08-22 14:18:17 +09:00
Dean Herbert	7903f49d27	Merge branch 'master' into action-key-counter	2017-08-21 17:47:19 +09:00
smoogipooo	6a7e868a2e	Make taiko major bar line triangles show up again. Fixes #1081	2017-08-21 15:36:01 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
Dean Herbert	a18b2bd5f0	Hook everything up	2017-08-20 22:21:16 +09:00
Dean Herbert	59fc6cbed7	Add action support to InputDrum	2017-08-20 21:51:56 +09:00
smoogipooo	bb8c533802	Fix CI issues.	2017-08-09 17:34:09 +09:00
smoogipooo	e9a98358b3	Don't move completed drum rolls above the playfield.	2017-08-09 17:26:59 +09:00
smoogipooo	2334c109e5	Set better TaikoPlayfield default VisibleTimeRange.	2017-08-09 16:46:08 +09:00
smoogipooo	ef29d9c093	Merge remote-tracking branch 'origin/master' into taiko-timingchanges-2 ... # Conflicts: # osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs	2017-08-09 16:18:27 +09:00
Dean Herbert	723e27353c	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Dean Herbert	7c0e7ebcd0	Give HitRenderer a reference to Ruleset ... Used to get correct bindings for a mode (ActionMappingInputManager).	2017-08-09 13:05:52 +09:00
smoogipooo	a95ee7494f	Initial conversion of taiko to use ScrollingPlayfield.	2017-08-08 16:01:18 +09:00
smoogipooo	dc0d0a3602	CI.	2017-08-03 14:31:20 +09:30
smoogipooo	b2d69dfa02	Fix HitExplosion.	2017-08-03 13:36:49 +09:30
smoogipooo	14639ff8e3	Fix HitTarget.	2017-08-03 13:36:36 +09:30
smoogipooo	d796730e36	Fix KiaiHitExplosion.	2017-08-03 13:36:15 +09:30
smoogipooo	324fd456a7	Rework border + fillmodes + size in TaikoPlayfield.	2017-08-03 13:35:07 +09:30
smoogipooo	358b7c9d3d	Better InputDrum sizing + positioning.	2017-08-03 09:35:42 +09:30
smoogipooo	5352da277d	Remove ScaleFixContainer.	2017-08-03 08:16:19 +09:30
Dean Herbert	64f2e2dc32	Use Colour instead of ColourInfo	2017-07-23 13:06:16 +02:00
Thomas Müller	e68675f970	Rename EasingTypes to Easing	2017-07-22 20:53:53 +02:00
Thomas Müller	440878945e	Remove remaining usages of AddDelay	2017-07-17 18:16:15 +03:00
Thomas Müller	032e9df67b	ApplyDelay -> AddDelay	2017-07-16 17:47:29 +03:00
Thomas Müller	71105bb9ee	Delay -> ApplyDelay; DelayReset -> ResetDelay	2017-07-16 14:06:46 +03:00
Thomas Müller	a5e610a7ba	Update framework and fix compilation ... Most issues were related to BeginLoopedSequence usage and lack of "this." in front of transform helpers.	2017-07-14 19:18:12 +03:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
smoogipooo	7afa1766e1	Make HitExplosion circular again, keep it masked to the stage.	2017-05-24 15:48:47 +09:00
smoogipooo	56fe97a147	Make kiai hit explosions slightly more prominent.	2017-05-24 15:48:27 +09:00
smoogipooo	4224143136	Add faint kiai explosion on the hit marker.	2017-05-24 14:56:07 +09:00
smoogipooo	9255297075	Cleanup.	2017-05-23 17:59:45 +09:00
smoogipooo	ae94e6ea85	Redesign hit explosions.	2017-05-23 17:57:34 +09:00
smoogipooo	4c66157a07	Merge branch 'beat-sync-container-improvements' into taiko-visual-update	2017-05-23 16:51:45 +09:00
smoogipooo	61348ff08d	Restructure playfield so that various elements are masked.	2017-05-23 16:42:17 +09:00
smoogipooo	836bf930a0	More cleanups.	2017-05-23 15:29:38 +09:00
smoogipooo	002a0e99a2	Use SortedList + BinarySearch to find control points at time values.	2017-05-23 15:20:32 +09:00
smoogipooo	3cdfd2eef5	Split ControlPoint into different types. ... # Conflicts: # osu.Game.Rulesets.Mania/UI/Column.cs	2017-05-23 14:03:40 +09:00
smoogipooo	6cef3021c7	Adjust sizing to better fit glows within the playfield.	2017-05-22 19:50:01 +09:00
smoogipooo	67cf64062a	Add flag to determine whether the beatmap requested for conversion is for the current ruleset.	2017-05-19 16:02:40 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
smoogipooo	6cc54773e8	Fix taiko right background not scaling with the playfield as intended.	2017-05-11 17:18:22 +09:00
Dan Balasescu	d4e75ecec4	Rename to use -index.	2017-04-18 17:37:01 +09:00
Dean Herbert	4895a482b4	That's a lot of white spaces	2017-04-18 17:26:59 +09:00
smoogipooo	579698f0a9	Merge remote-tracking branch 'origin/master' into taiko-fixes ... # Conflicts: # osu.Game.Rulesets.Taiko/UI/TaikoHitRenderer.cs	2017-04-18 17:12:23 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00