258 Commits

Author	SHA1	Message	Date
Dragicafit	c6c4bcccc3	relocate SkinnableCursor	2018-12-12 11:17:09 +01:00
Dragicafit	4b073aed83	remove spaces	2018-12-11 21:02:12 +01:00
Dragicafit	bfe3b03945	using SkinReloadableDrawable	2018-12-11 18:06:41 +01:00
Dragicafit	fb7d767909	adjust if position	2018-12-11 00:38:03 +01:00
Dragicafit	506f27a92e	cursorExpand is now a bool	2018-12-07 23:52:57 +01:00
Dragicafit	0816eaacb8	Make CursorExpand skinnable	2018-12-07 22:22:40 +01: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
smoogipoo	fbc20d2d4d	Hide placement when cursor is not in the playfield	2018-11-13 12:52:04 +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
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
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
Dean Herbert	2ed7785cfc	Merge remote-tracking branch 'upstream/master' into update-framework	2018-09-26 19:50:48 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
Kyle Chang	2069467434	Use HitObject scale to determine judgement size	2018-09-24 21:18:55 -04:00
Kyle Chang	7a43677849	Make judgements scale with cs	2018-09-22 22:54:38 -04:00
smoogipoo	0bc2bcaf14	Remove GetAspectAdjustedSize() and PlayfieldArea	2018-09-21 15:14:49 +09:00
smoogipoo	26094ea325	Simplify + rename playfield layers in Osu/Catch	2018-09-21 15:01:58 +09:00
smoogipoo	a166d03ede	Remove duplicate implementation of the Osu playfield layer	2018-09-21 14:43:38 +09:00
smoogipoo	368ceec47c	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00
smoogipoo	826dc6ceb7	Make Playfield not a ScalableContainer	2018-09-21 14:02:32 +09:00
Dean Herbert	a1780fddc9	DrawInfo -> DrawColourInfo	2018-09-06 18:02:04 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
Dean Herbert	68a79f895a	Fix mania throwing an exception on start of map	2018-08-30 14:58:00 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
Dean Herbert	e628e78f24	Update uniform usage	2018-08-20 13:39:22 +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	4548d2c87f	Make Rulesets.Osu use the new judgement result structure	2018-08-02 20:36:38 +09:00
Dean Herbert	d868d81b59	Merge branch 'master' into centralise-judgement-display	2018-07-23 02:58:49 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	3fc7f33e90	Merge branch 'master' into centralise-judgement-display	2018-07-20 17:29:15 +09:00
smoogipoo	1139f0dbf2	Centralise method of disabling playfield judgements	2018-07-20 17:04:33 +09:00
Dean Herbert	ffd3040fe2	Fix GameplayCursor state not restoring correctly after Show/Hide	2018-07-18 19:59:04 +09:00
Dan Balasescu	64cde1ebad	Merge branch 'master' into use-switch-over-if	2018-07-17 16:44:57 +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
Dean Herbert	b967fe714b	Fix lead-in time now being long enough in many cases	2018-07-17 14:29:22 +09:00
Dean Herbert	cacabeb67e	Remove unused field	2018-06-29 17:00:41 +09:00
Tom Arrow	ad883e087a	RulesetContainer<TObject> cannot be derived	2018-06-19 14:31:24 +02:00
Dean Herbert	f4cb0d7d8d	Fix memory leak due to incorrect binding	2018-06-13 14:16:58 +09:00
Dean Herbert	ae136e89a4	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Dan Balasescu	9994c69d58	Merge branch 'master' into fix-object-ordering	2018-06-11 17:53:33 +09:00
smoogipoo	f4fbf27d42	Give ruleset settings a ruleset-specific config manager	2018-06-11 13:28:50 +09:00
smoogipoo	ff60f69f47	Explicitly construct local beatmaps rather than using GetBoundCopy	2018-06-06 20:19:30 +09:00
smoogipoo	72cc53aded	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
Dean Herbert	3567823759	Reverse order of exposed objects in HitObjectContainer ... Closes #2740.	2018-06-06 15:03:47 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	77e661489d	Merge branch 'i-beatmap' into beatmap-conversion-rework	2018-05-07 10:00:24 +09:00
smoogipoo	c9e4a07e12	Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs # osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs	2018-04-20 18:04:43 +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	cea3e1c7f5	Remove now unnecessary approachcircle proxy disables ... Prereqs: - [ ] ppy/osu-framework#1505	2018-04-09 18:44:50 +09:00
smoogipoo	d4cb00e08f	Don't display judgements in OsuEditPlayfield	2018-04-04 17:12:41 +09:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	d909cce8d6	Add the ability to skin the gameplay cursor	2018-03-21 20:06:10 +09:00
Dean Herbert	13f64a1d12	Merge branch 'master' into cursor-trail	2018-03-14 11:42:40 +09:00
Dean Herbert	5092fe5596	Adjust cursor trail display length ... In line with shader change at ad5ddec7b2	2018-03-11 02:11:56 +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
Dean Herbert	3ddaf1879d	CursorTrail always present, just to be safe	2018-03-05 20:20:06 +09:00
Dean Herbert	f4965ee7d6	Use high precision updating on CursorTrail ... Avoids bloackage	2018-03-05 20:20:06 +09:00
Dean Herbert	69c0e95d9d	Use a better fade effect for the gameplay cursor	2018-03-05 20:20:06 +09:00
Dean Herbert	60f851df3e	Add support for DrawInfo alpha when drawing CursorTrail	2018-03-05 20:15:07 +09:00
smoogipoo	a3c7755ade	Implement a conversion process for ReplayFrames	2018-03-01 02:28: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	ef11ce3dd1	Remove Size override from OsuPlayfield	2018-02-19 17:02:27 +09:00
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +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	5952f1e7f1	Adjust transforms for cursor transitions	2018-01-12 19:34:14 +09:00
smoogipoo	512e4d2c9f	Rewrite the way that cursor overrides are done game-wide	2018-01-12 18:13:17 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	36e9232472	Merge master into netstandard	2018-01-05 00:42:48 +09:00
Aergwyn	7d29c076d2	fix circles and slider sequences ... + minor cleanup	2017-12-27 21:12:02 +01:00
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
smoogipoo	def2e5bd17	Make editor discard approach circles ... Temporary solution for now.	2017-12-22 22:16:54 +09:00
smoogipoo	6a690908cf	Fix up possible nullref due to early access of Parent	2017-12-14 20:24:24 +09:00
TocoToucan	219bdbc4e1	Populate HandleInput automatically	2017-12-09 22:21:17 +03:00
smoogipoo	677f3653eb	Hide osu! playfield cursor	2017-11-30 19:19:34 +09:00
smoogipoo	aac41d2de6	Disable resharper inspections on case-by-case basis	2017-11-20 18:55:48 +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
Dean Herbert	f32d444d68	Remove generics from Playfield (fixes catch)	2017-09-12 18:19:28 +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	a7a7e0323f	Update autoplay and replay handling to result in actions, not keys	2017-08-24 15:36:42 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
Dean Herbert	7c9d6c9c83	Initial refactoring of key binding logic	2017-08-14 20:19:25 +09:00
Dean Herbert	99458aab48	Propagate framework updates	2017-08-12 19:54:07 +09:00
Dean Herbert	48d4ed55e9	Move a lot of code to framework	2017-08-11 16:11:46 +09:00
Dean Herbert	798fff00b2	Remove shortcomings, remove InputState.Data usage, make everything amazing ... No more casting!	2017-08-10 19:28:24 +09:00
Dean Herbert	1fe273cbc0	Move GameplayCursor to osu! ruleset and make work with OsuActions	2017-08-10 18:37:41 +09:00
Dean Herbert	e9a11ebc9f	Use new population methods and implement osu! ruleset actions	2017-08-10 18:31:12 +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
Dean Herbert	b88f37de45	Add custom actions for Catch ... Reworks input management for rulesets	2017-08-09 11:50:34 +09:00
smoogipooo	cae21869d0	Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍.	2017-08-08 17:37:11 +09:00
Dean Herbert	d3f5de9bf9	Move to UI namespace	2017-07-13 15:44:42 +09:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +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	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00