2171 Commits

Author	SHA1	Message	Date
smoogipoo	38c2c328ff	Rename HitObject -> DrawableObject in selection blueprints	2019-10-21 17:04:56 +09:00
smoogipoo	dc222b5e4d	Add common path for duplicated code	2019-10-21 13:52:55 +09:00
Dean Herbert	d0eaf629af	Merge branch 'master' into dho-apply	2019-10-18 19:45:10 +09:00
smoogipoo	190a83da6e	Refresh the grid after a placement	2019-10-18 19:04:08 +09:00
Dean Herbert	07286c0cfc	Fix editor's clock not being processed unless composer is loaded	2019-10-18 18:21:53 +09:00
smoogipoo	31313ec9e1	Fix potential nullref	2019-10-18 17:56:31 +09:00
smoogipoo	89f50b26f7	Fix hitobject combo colour potentially not getting adjusted	2019-10-18 17:32:11 +09:00
Dean Herbert	50d4a9d726	Merge pull request #6534 from smoogipoo/placement-blueprint-starttime ... Make BeginPlacement() set the hitobject start time	2019-10-18 16:25:38 +09:00
smoogipoo	f1d7e7e7f6	Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration	2019-10-18 13:49:09 +09:00
smoogipoo	463079e148	Implement placement snapping	2019-10-18 13:48:59 +09:00
smoogipoo	5d3d25d3b6	Make method private for now	2019-10-18 13:24:28 +09:00
smoogipoo	cb301a4661	Improve performance of intra-frame updates/deletions	2019-10-18 13:18:57 +09:00
smoogipoo	9a896d52bf	Fix nested hitobjects not updating	2019-10-18 13:18:41 +09:00
smoogipoo	b047e05d86	Fix bad variable names	2019-10-18 13:18:16 +09:00
smoogipoo	ba4402207a	Implement selection time snapping	2019-10-18 12:53:38 +09:00
smoogipoo	1dc7c59853	Implement selection position snapping	2019-10-18 12:53:27 +09:00
smoogipoo	c4704f6a29	Add beat snap grid to the composer	2019-10-18 12:47:52 +09:00
smoogipoo	d3e38f5e5a	Make the editor beatmap protected	2019-10-18 12:40:31 +09:00
smoogipoo	c5ee533524	Merge branch 'dho-apply' into beatsnap-grid-integration	2019-10-18 12:38:29 +09:00
smoogipoo	f429a8f7c2	Add back/obsolete old AddNested() method	2019-10-17 14:02:08 +09:00
smoogipoo	d8f3678c3c	Rename parameter	2019-10-17 12:53:54 +09:00
smoogipoo	9b9138253c	Remove finalizer	2019-10-17 11:27:23 +09:00
smoogipoo	8d7453c251	Rework construction of nested hitobjects	2019-10-16 22:10:50 +09:00
smoogipoo	79b2c7b480	Make BeginPlacement() set the hitobject start time	2019-10-16 20:04:15 +09:00
smoogipoo	96c6aeefe9	Remove out-of-date todo	2019-10-15 16:16:33 +09:00
smoogipoo	12cd57744b	Make RulestStore initialise at construction time	2019-10-15 16:14:06 +09:00
Dean Herbert	00d4d976b7	Move editor selections relative to hitobject start positions (#6431) ... Move editor selections relative to hitobject start positions	2019-10-11 19:35:11 +09:00
Dean Herbert	4e273fc628	Return correct allowed value for Perfect ... Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>	2019-10-09 19:50:05 +09:00
Dean Herbert	9f2a648432	Add full asserts	2019-10-09 19:23:37 +09:00
Dean Herbert	ad6b8d3e04	Add result offset bounding to result itself, rather than just transforms	2019-10-09 19:08:55 +09:00
Dean Herbert	51bf600ea7	Use empty hitwindows instead of null	2019-10-09 19:08:31 +09:00
LeNitrous	59b2f02828	initial implementation of customizable mods	2019-10-08 18:34:09 +08:00
smoogipoo	c1db11fa06	More removal of "drag"	2019-10-08 19:24:58 +09:00
smoogipoo	08d043f447	Move selection relative to the hitobject start positions	2019-10-08 18:57:03 +09:00
Dean Herbert	6fce646369	Merge branch 'master' into placement-blueprint-movement	2019-10-04 19:05:56 +08:00
Dean Herbert	9eab56e2fc	Merge branch 'master' into editor-beatmap-changed-event	2019-10-04 17:58:58 +08:00
Dean Herbert	aeb62825cd	Move out requireMoreUpdateLoops for better consistency	2019-10-04 13:42:06 +08:00
Dean Herbert	ddef7fa3ba	Repair behavioural change	2019-10-04 13:32:47 +08:00
smoogipoo	652acac87f	Move placement movement event to BlueprintContainer	2019-10-03 16:14:42 +09:00
Dean Herbert	b28689c774	Fix key counters appearing negative on intense beatmaps ... When `FrameStabilityContainer` decides it needs multiple updates on the same frame, it ends up with an elapsed time of zero. This was interacting badly with the condition used in `RulesetInputManager` to govern playback direction. I have changed this to use `Rate` as exposed by the frame stable clock. - Closes #6198.	2019-10-03 15:01:54 +08:00
smoogipoo	2c13043c42	Hook up the event to HitObjectComposer	2019-10-03 14:40:00 +09:00
smoogipoo	897b3233af	Add start time tracking to EditorBeatmap	2019-10-03 14:23:48 +09:00
smoogipoo	ce609302ed	Fix CI error	2019-10-01 15:41:09 +09:00
miterosan	9f498d2990	Log the exception that caused to loading of rulesets to fail.	2019-09-29 19:25:44 +02:00
smoogipoo	45f2bcc440	Fix combo bindings not being bound to nested hitobjects	2019-09-26 17:39:19 +09:00
smoogipoo	706e884cc0	Update accent colour on combo index change	2019-09-26 17:13:13 +09:00
smoogipoo	bbf0544a8d	Add bindables for IHasComboInformation properties	2019-09-26 16:55:08 +09:00
Dean Herbert	7d5544460b	Fix mania scrolling speed not including beatmap slider multipli… (#6236) ... Fix mania scrolling speed not including beatmap slider multiplier Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-09-25 22:34:46 +09:00
smoogipoo	244627ff10	Add comment + test for slider multiplier	2019-09-25 20:12:01 +09: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
smoogipoo	4abe0473b9	Fix relative beat length not considering slider multiplier	2019-09-24 16:49:42 +09:00
smoogipoo	af0c15a93c	Fix initial hitobject states not being recomputed correctly	2019-09-24 16:48:39 +09:00
smoogipoo	75cceb9e30	Fix LifetimeChanged being invoked before lifetime is set	2019-09-24 16:47:34 +09:00
Dean Herbert	c99b48f934	Bring up-to-date and use IApplicableFailOverride	2019-09-21 23:30:54 +09:00
Dean Herbert	4c4b71eeec	Merge branch 'master' into master	2019-09-21 22:45:05 +09:00
Andrei Zavatski	e7118a9272	Use System mod type for NoMod	2019-09-20 23:47:21 +03:00
Andrei Zavatski	0d43f4e4f9	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-09-20 23:39:44 +03:00
Vperus	ac8fe6045f	Fixed typo ... Changed CreateReourceStore() to CreateResourceStore()	2019-09-20 19:58:39 +03:00
Andrei Zavatski	0cf4db899f	Few cleanups	2019-09-19 17:03:52 +03:00
Andrei Zavatski	529a1c3b91	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-09-19 16:46:58 +03:00
Dean Herbert	0640b2eb35	Fix judgement sizes not matching legacy skins (#6145) ... Fix judgement sizes not matching legacy skins	2019-09-19 18:49:35 +09:00
Dean Herbert	3abcd898a6	Add hit lighting (#6144) ... Add hit lighting Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-09-19 18:49:22 +09:00
Dan Balasescu	027d6194f2	Merge branch 'master' into add-hit-lighting	2019-09-19 18:07:29 +09:00
smoogipoo	bc9941a990	Newline required when xmldocs are involved	2019-09-19 18:00:11 +09:00
smoogipoo	65276cd235	Remove whitespace	2019-09-19 17:58:10 +09:00
smoogipoo	db24cfbead	Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect ... # Conflicts: # osu.Game/Screens/Play/Player.cs	2019-09-19 17:57:04 +09:00
smoogipoo	da15b900f7	Remove virtual member from ModBlockFail	2019-09-19 17:44:24 +09:00
Dean Herbert	e6c36a8bc7	Fix scaling mode being applied to judgements	2019-09-19 17:36:32 +09:00
Dean Herbert	2cd7c769e1	Merge remote-tracking branch 'upstream/master' into fix-judgement-size	2019-09-19 16:32:37 +09:00
smoogipoo	762adb783a	Fix duplicate invocation of updateState on load complete	2019-09-19 14:15:06 +09:00
Dean Herbert	2296ea75d7	Add reference to xmldoc ... Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>	2019-09-19 02:03:30 +09:00
Dean Herbert	1150e9fdfb	Bring other mods up-to-date	2019-09-19 01:45:42 +09:00
Dean Herbert	ff3a7c1d13	Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect	2019-09-19 01:36:29 +09:00
Dean Herbert	5901a915e7	Always update drawable hitobject state on skin change	2019-09-18 20:19:57 +09:00
Dean Herbert	26eca5b1f4	Fix judgement sizes not matching skins stable	2019-09-18 02:56:03 +09:00
Dean Herbert	ba76f09c99	Add initial implementation of hit lighting ... Requires a supporting skin, like osu!classic for now.	2019-09-18 02:49:54 +09:00
Dean Herbert	38d85e44be	Merge branch 'master' into key-counter-fixes	2019-09-17 22:33:15 +09:00
Dean Herbert	624e5644a4	Change osu!catch key trigger to occur on frame before positional change	2019-09-13 23:06:35 +09:00
Dan Balasescu	b10ce0b12d	Merge branch 'master' into key-counter-fixes	2019-09-13 19:43:33 +09:00
Dan Balasescu	125b3fda6c	Merge branch 'master' into improve-catch-replay-frames	2019-09-13 19:23:15 +09:00
Dean Herbert	b81b162ee1	Update InitialLifetimeOffset comment	2019-09-12 19:30:27 +09:00
Dean Herbert	9fc60aeefc	Merge branch 'master' into reset-dho-lifetimes	2019-09-12 19:29:14 +09:00
Dean Herbert	f21e47d6d2	Move expire to DrawableHitObject	2019-09-12 19:29:08 +09:00
Dean Herbert	1dfd104690	Merge branch 'improve-catch-replay-frames' into key-counter-fixes	2019-09-12 18:34:00 +09:00
Dean Herbert	acdfeef1dc	Improve how osu!catch stores and replays key actions	2019-09-12 18:33:46 +09:00
Dean Herbert	0cdf125c1e	Handle key counter rewinding in a better way ... Use ElapsedFrameTime rather than storing state data	2019-09-12 15:42:14 +09:00
Dean Herbert	af3bb5a2cd	Centralise and share bar line generation code between rulesets	2019-09-10 13:30:54 +09:00
Dean Herbert	07fce8397b	Move reset call to ctor	2019-09-09 14:24:17 +09:00
iiSaLMaN	be803fa921	Reset score processor before starting the simulation	2019-09-07 18:15:49 +03:00
iiSaLMaN	55b2bc1ed5	Set Health default value to 1	2019-09-07 18:03:04 +03:00
Dean Herbert	7f2d14416a	Reset DrawableHitObject lifetimes on state change	2019-09-07 14:44:44 +09:00
Dean Herbert	b89fb5cdf7	Fix failing test	2019-09-06 16:51:30 +09:00
Dean Herbert	6ce36bd39e	Merge branch 'master' into stop-counting-to-score-after-fail	2019-09-06 16:12:53 +09:00
Dean Herbert	a50284a5eb	Merge pull request #6019 from peppy/hit-window-refactor ... Refactor HitWindows for legibility	2019-09-06 16:10:04 +09:00
Dean Herbert	985375d1c6	Remove private field xmldoc	2019-09-06 15:47:01 +09:00
Dean Herbert	4031f51745	More permissive IsHitResultAllow by default	2019-09-06 15:37:30 +09:00
Dean Herbert	c379480e7b	Merge branch 'master' into remove-judgement-occurred	2019-09-06 15:32:34 +09:00
Dean Herbert	f925e781a9	Refactor HitWindows for legibility	2019-09-06 15:24:14 +09:00
Dean Herbert	bf6f803e69	Nest temporary class	2019-09-06 12:12:27 +09:00
Dean Herbert	7d1f5310d2	Don't implement anything	2019-09-06 12:03:29 +09:00
Dan Balasescu	5dbdce17a7	Merge branch 'master' into fix-sample-fallback	2019-09-06 11:27:39 +09:00
Dean Herbert	50985d1b1d	Fix disposal logic	2019-09-06 10:43:19 +09:00
Dean Herbert	d6cdde552d	Add comment explaining dispose logic	2019-09-06 01:14:37 +09:00
Dean Herbert	dafe9da851	Dispose config managers ahead of time to avoid database errors	2019-09-06 00:22:35 +09:00
Dean Herbert	60c2d113b8	Fix typo	2019-09-05 23:07:03 +09:00
Dean Herbert	0a6c42972c	Add back missing sample fallback to default skin	2019-09-05 23:01:35 +09:00
Dean Herbert	c0bcbfd892	Merge branch 'master' ... Conflicts: osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs	2019-09-05 14:40:30 +09:00
Dean Herbert	2c871c52f1	Add automatic resource mapping for rulesets to their own dll (#5988) ... Add automatic resource mapping for rulesets to their own dll	2019-09-05 14:18:12 +09:00
Dean Herbert	8e8f33ec7b	Remove null hinting for now	2019-09-04 21:35:59 +09:00
Dean Herbert	6197c7fd31	Add automatic resource mapping for rulesets to their own dll	2019-09-04 20:29:28 +09:00
Dean Herbert	b80a8296cd	Fix unavailable rulesets crashing at song select	2019-09-04 20:28:52 +09:00
smoogipoo	07f662071d	Remove judgementOccurred	2019-09-04 18:14:55 +09:00
Andrei Zavatski	04111cc3b7	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-09-04 02:46:23 +03:00
Dean Herbert	bebc3309ce	Refactor skin configuration to be infinitely extensible	2019-09-03 17:57:34 +09:00
Dean Herbert	05ed9d3802	Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements	2019-09-03 13:07:58 +09:00
Dean Herbert	4cad55cee6	Move hit windows lookup to DrawableRuleset	2019-09-03 13:05:03 +09:00
Dean Herbert	0261456d5a	Merge branch 'master' into play-to-gameplay	2019-09-03 11:42:15 +09:00
Dean Herbert	09097f7680	Merge branch 'master' into iskincomponent	2019-09-02 22:38:57 +09:00
Dean Herbert	91e3eeb1c0	Merge branch 'master' into beatmap-mod-selector	2019-09-02 21:35:42 +09:00
Dean Herbert	1e7528c2b3	Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements	2019-09-02 19:13:00 +09:00
smoogipoo	f20e07136a	Add attribute to catch potential future nullrefs	2019-09-02 17:48:41 +09:00
smoogipoo	f6102b4d92	Adjust xmldoc	2019-09-02 17:15:36 +09:00
smoogipoo	0c73c5acf3	Expose full hitobject rather than hit windows	2019-09-02 17:14:40 +09:00
smoogipoo	f2bdf94a1d	Add HitWindows to JudgementResult to indicate timing errors	2019-09-02 16:28:14 +09:00
Dean Herbert	e1e4c00a15	Merge branch 'master' into improve-scrolling-ruleset-performance	2019-09-02 15:09:48 +09:00
smoogipoo	d74e1b9b64	Remove from dictionary on Remove()	2019-09-02 15:06:43 +09:00
smoogipoo	8f8d35bd15	Delay initial hitobject state computation	2019-09-02 15:06:34 +09:00
Dean Herbert	f9fcf1562f	Merge remote-tracking branch 'upstream/master' into iskincomponent	2019-09-02 14:21:02 +09:00
smoogipoo	2945fef62d	Expose HasCompleted from ScoreProcessor	2019-09-02 13:04:30 +09:00
Dean Herbert	7ca51d3866	Fix resume overlay being drawn below cursor ... Closes #5905.	2019-09-02 11:20:55 +09:00
Dean Herbert	8f5dc06d55	Merge remote-tracking branch 'upstream/master' into accuracy-bar	2019-08-30 20:18:25 +09:00
Dean Herbert	741bd0a5cf	Fix incorrect colour sizes and simplify alignment specification	2019-08-30 18:35:17 +09:00
Dean Herbert	70e417533f	Update naming	2019-08-30 15:13:29 +09:00
Dean Herbert	a15828ab25	Introduce the concept of SkinComponents ... Removes reliance on string lookups and better defines elements for introduction into database	2019-08-30 14:55:52 +09:00
Dean Herbert	dc1046bf0c	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-30 12:53:05 +09:00
smoogipoo	6ab2b20c70	Add an interface for working beatmaps	2019-08-29 19:38:44 +09:00
Dan Balasescu	d8a48a37d1	Merge branch 'master' into editor-refactor	2019-08-29 18:22:42 +09:00
smoogipoo	714ee312da	Rename DrawableEditRuleset -> DrawableEditRulesetWrapper	2019-08-29 18:20:43 +09:00
Dean Herbert	98626018fd	Encapsulate editor hitobject additions/removals (#5878) ... Encapsulate editor hitobject additions/removals	2019-08-29 18:20:24 +09:00
smoogipoo	87e28ab1f9	Remove non-generic DrawableEditRuleset	2019-08-29 18:12:29 +09:00
smoogipoo	59296d12f3	Refactor HitObjectComposer	2019-08-29 18:02:50 +09:00
smoogipoo	0fbdcabb6f	Re-use a single beatmap processor	2019-08-29 17:21:52 +09:00
smoogipoo	b40143cb73	Remove unnecessary comment	2019-08-29 17:18:34 +09:00
smoogipoo	dad0fa2dca	Bind disposal	2019-08-29 16:31:40 +09:00
smoogipoo	5db813b7a4	Add secondary interface for further abstraction	2019-08-29 16:26:39 +09:00
smoogipoo	7927b684d3	Hook up + use editor beatmap	2019-08-29 16:06:40 +09:00
smoogipoo	6949c96aaa	Add initial EditorBeatmap structure	2019-08-29 15:17:27 +09:00
Dean Herbert	1597cf874e	Merge branch 'master' into relative-beat-lengths	2019-08-28 20:26:20 +09:00
Dean Herbert	f6ad95018a	Centralise default beat length specification	2019-08-28 20:22:16 +09:00
Dean Herbert	ecfcbe3723	Merge remote-tracking branch 'upstream/master' into relative-beat-lengths	2019-08-28 20:21:56 +09:00
Dean Herbert	9a98f39f06	Share logic with other rulesets (and make default)	2019-08-28 18:12:47 +09:00
Dean Herbert	7ea55a5cdd	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-28 16:36:20 +09:00
Dean Herbert	7ccc409df7	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-27 18:27:26 +09:00
smoogipoo	9e926d44c0	Obsolete legacy UpdateState() method	2019-08-27 16:09:47 +09:00
Dean Herbert	6aab7168d4	Merge branch 'master' into relative-beat-lengths	2019-08-27 10:59:52 +09:00
Dean Herbert	07380af877	Merge branch 'master' into scrolling-lifetime-safety	2019-08-26 19:07:05 +09:00
Dean Herbert	0422c19c2f	Group lifetime setters together	2019-08-26 19:06:23 +09:00
Dean Herbert	dffb2d6474	Merge branch 'master' into relative-beat-lengths	2019-08-26 18:59:50 +09:00
Dean Herbert	28dc51279a	Allow RulesetConfigCache to return null configs (#5835) ... Allow RulesetConfigCache to return null configs	2019-08-26 18:59:26 +09:00
Dean Herbert	b41bed8ba0	Add nullref safety to FrameStablePlayback boolean (#5834) ... Add nullref safety to FrameStablePlayback boolean	2019-08-26 18:58:27 +09:00
smoogipoo	fd4c6e08ca	Merge remote-tracking branch 'origin/master'	2019-08-26 17:37:06 +09:00
smoogipoo	fb1cd9e5e7	Add a sane default lifetime end for scrolling hitobjects	2019-08-26 16:47:23 +09:00
smoogipoo	6dfe95db74	Allow RulesetConfigCache to return null configs	2019-08-26 16:34:12 +09:00
smoogipoo	6596d7fc46	Add nullref safety to FrameStablePlayback boolean	2019-08-26 16:33:24 +09:00
smoogipoo	1cfe2b7de8	Fix timing points beyond the end time potentially becoming dominant	2019-08-26 16:31:34 +09:00
smoogipoo	d99c60adc7	Provide a way to scale beat lengths relative to each other	2019-08-26 12:51:13 +09:00
Dean Herbert	5e362d10b1	Add ruleset-specific legacy skin providers ... This moves implementation of osu! skinnables to OsuLegacySkin.	2019-08-26 12:21:49 +09:00
Dean Herbert	acc07c1d65	Remove mod icon offset	2019-08-21 22:18:29 +09:00
iiSaLMaN	439d825dd1	Disallow adding bonus judgements' result to statistics	2019-08-20 18:39:29 +03:00
Desconocidosmh	b3556403aa	Make GetNextObject() a virtual method	2019-08-19 16:18:25 +02:00
Dean Herbert	152df9f3d5	Remove accidental blank line	2019-08-16 20:23:09 +09:00
Dean Herbert	d11b896148	Move FrameStablePlayback handling to early return	2019-08-16 20:21:00 +09:00
Dean Herbert	58d2268b9e	Combine conditionals that provide the same behaviour	2019-08-16 19:52:35 +09:00
smoogipoo	8c67f58e2d	Disable frame-stable playback in the editor	2019-08-15 18:25:31 +09:00
Dean Herbert	bd61642ac6	Merge branch 'master' into beatmap-mod-selector	2019-08-13 00:54:21 +09:00
iiSaLMaN	883102ee5d	Move score multiplier logic inside score calculation	2019-08-12 16:40:52 +03:00
Andrei Zavatski	b71c776e65	Add web-like hover behavior	2019-08-12 16:20:36 +03:00
Andrei Zavatski	62a91e4aaa	Add the ability to override Highlighted action to the ModIcon	2019-08-12 15:20:21 +03:00
Andrei Zavatski	16b6ed846f	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-08-12 14:46:24 +03:00
Dean Herbert	90b1fe81f3	Update cached usage in line with framework changes	2019-08-09 19:12:29 +09:00
Dean Herbert	29870c773c	Merge branch 'master' into stop-counting-to-score-after-fail	2019-08-09 14:16:34 +09:00
smoogipoo	a9c4b5ac4e	Add tests	2019-08-09 14:04:56 +09:00
smoogipoo	33f4b628a5	Make HasFailed private set	2019-08-09 13:42:02 +09:00
smoogipoo	88fa06efba	Refactor as proposed	2019-08-09 13:38:04 +09:00
Dean Herbert	dbb3b583cf	Log error for invalid beatmap/storyboard events instead of thro… (#5611) ... Log error for invalid beatmap/storyboard events instead of throwing Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-08-09 12:56:47 +09:00
Dean Herbert	7e9c100c9b	Apply new resharper refactors	2019-08-09 12:29:33 +09:00
iiSaLMaN	566d874641	Prevent failing when reverting to a hasFailedAtJudgement	2019-08-08 15:25:07 +03:00
smoogipoo	de4ad1f625	Fix bad log message	2019-08-08 14:44:49 +09:00
smoogipoo	ac2060f1cf	Throw exceptions and let LegacyDecoder handle them	2019-08-08 14:44:04 +09:00
Dean Herbert	a345955f45	Add mentions linking ScoreProcessor apply/revert methods together	2019-08-08 13:57:04 +09:00
iiSaLMaN	c77e6074f6	Disallow adding to score after the player has failed	2019-08-07 19:58:26 +03:00
Andrei Zavatski	d9fd054102	Merge master with conflicts resolved	2019-08-07 16:05:28 +03:00
Dan Balasescu	df784e1d8e	Merge branch 'master' into mod-icon-improvements	2019-08-07 19:43:52 +09:00
Dean Herbert	b0e0659715	Dispose instead	2019-08-07 17:33:30 +09:00
Dean Herbert	c6d481238d	Move QuadBatch to a local variable to stop resharper complaining	2019-08-07 16:56:22 +09:00
Andrei Zavatski	1d42f0959a	ModIcon improvements	2019-08-07 08:46:27 +03:00
Andrei Zavatski	87974850dd	Initial implementation	2019-08-07 08:42:43 +03:00
smoogipoo	0ff1c6184b	Add generation comment	2019-08-01 17:36:20 +09:00
smoogipoo	a2468e599b	Fix ticks in repeat spans being returned in reverse order	2019-08-01 17:31:37 +09:00
smoogipoo	bc80fa11bb	Mode IApplicableToBeatmap application to WorkingBeatmap	2019-08-01 12:41:46 +09:00
smoogipoo	8a64ab0384	Remove generics from IApplicableToBeatmap	2019-08-01 12:39:32 +09:00
smoogipoo	e57663b39c	Apply mod score multipliers	2019-07-31 17:55:22 +09:00
smoogipoo	6bfac9f8e4	Remove protected ctor	2019-07-31 17:50:13 +09:00
Dean Herbert	894d573fbc	Cache DrawableHitObject for skinnables to access (#5463) ... Cache DrawableHitObject for skinnables to access	2019-07-29 18:49:37 +09:00
Dan Balasescu	7779302e82	Merge branch 'master' into skin-scaling-modes	2019-07-29 17:47:07 +09:00
iiSaLMaN	ba4045a761	Fix transforming mods not working properly ... Hidden, Grow, Deflate, etc..	2019-07-27 00:22:40 +03:00
Dean Herbert	eb6bda3f08	Cache DrawableHitObject for skinnables to access	2019-07-25 16:03:07 +09:00
Dean Herbert	efad9b3150	Merge branch 'master' into skin-scaling-modes	2019-07-24 18:37:31 +09:00
smoogipoo	4e7e2d1d52	Adjust comments	2019-07-23 21:16:09 +09:00
smoogipoo	74b09c72fa	Refactor state updates to convert State into an IBindable	2019-07-23 21:16:09 +09:00
Dan Balasescu	9b526ef61e	Merge branch 'master' into move-state-logic	2019-07-23 20:37:57 +09:00
Dean Herbert	91e21688d8	Make AccentColour a bindable (#5420) ... Make AccentColour a bindable Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-07-23 20:37:47 +09:00
smoogipoo	776757545d	Fix FTB causing flashlight to block vision correctly	2019-07-23 15:17:02 +09:00
Dean Herbert	d5ee4cbc9c	Move TouchDevice mod to new "system" category	2019-07-23 13:14:28 +09:00
Dean Herbert	d4d286c988	Add full documentation	2019-07-22 16:08:38 +09:00
Dean Herbert	c3b81bef4a	Flip default to the preferred method going forward	2019-07-22 15:55:38 +09:00
Dean Herbert	be170b4124	Naming and documentation improvements	2019-07-22 15:50:02 +09:00
Dean Herbert	91f86adb66	Move DrawableHitObject state management to base class	2019-07-22 15:07:12 +09:00
Dean Herbert	8327452fe1	Make AccentColour a bindable	2019-07-22 14:48:59 +09:00
Dean Herbert	74c961bcff	Add more flexible skin element confine modes	2019-07-22 14:42:56 +09:00
Dean Herbert	f1423b8cb5	Add more brackets	2019-07-18 00:03:04 +09:00
Dean Herbert	3e57fcf5c5	Merge remote-tracking branch 'upstream/master' into cleanup-slider-bodies	2019-07-17 22:11:01 +09:00
Dean Herbert	1a19cf0739	Fix 0-length sliders not getting correct lengths (#5033) ... Fix 0-length sliders not getting correct lengths	2019-07-17 18:01:57 +09:00
smoogipoo	a9286fee07	Recycle slider paths when the parenting slider dies	2019-07-17 16:20:27 +09:00
smoogipoo	ed203cb0ff	Delay intial hitobject updates	2019-07-16 13:45:59 +09:00
Dean Herbert	d0c8aaba4e	Override basic equality function too	2019-07-15 15:50:50 +09:00
Dean Herbert	9c1badd2e3	Fix rulesets not matching in dictionary lookups due to missing GetHashCode implementation	2019-07-15 15:42:54 +09:00
Dean Herbert	80ddfc3b1e	Disable frame accurate replay playback ... I want to prioritise better playback performance over accuracy for now. Also, in my testing this is still 100% accurate due to the addition of the FrameStabilityContainer, which is pretty cool.	2019-07-10 10:27:51 +09:00
Dean Herbert	84919d70bb	Health bar -> Health display ... Also inverts logic	2019-07-07 05:30:30 +09:00
Salman Ahmed	1f13b94c72	Fix build error	2019-07-06 18:44:55 +03:00
Salman Ahmed	a42c79895d	Remove unnecessary private field	2019-07-06 18:38:41 +03:00
Salman Ahmed	dfabed3d85	Merge branch 'master' into applicable-to-hud	2019-07-06 16:30:02 +03:00
iiSaLMaN	530e07110f	Use a descriptive name for the setting	2019-07-06 06:32:25 +03:00
smoogipoo	5862eb172a	Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders ... # Conflicts: # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs	2019-07-05 15:48:04 +09:30
Dean Herbert	8120bb36bc	More methods	2019-07-03 18:42:10 +09:00
Dean Herbert	06ef8f71e9	Fix typo	2019-07-03 18:41:01 +09:00
Dean Herbert	62dd89197c	Refactor comment slightly	2019-07-03 18:36:04 +09:00
miterosan	5ecb764cdc	Remove whitespaces and lowercase the comments	2019-07-03 10:57:09 +02:00
miterosan	43d7f66c5b	Add comment about the android ruleset situation.	2019-07-03 10:54:10 +02:00
miterosan	ab244d1b7f	Only log that the rulesets could not be loaded from a directory.	2019-07-03 10:21:18 +02:00
miterosan	d9e646d9ef	Use addRuleset inside loadRulesetFromFile	2019-07-03 09:51:09 +02:00
Salman Ahmed	98daaf634a	Simplify changes	2019-07-03 06:44:17 +03:00
Salman Ahmed	3f39541cc2	Fade health bar on value change	2019-07-03 05:11:11 +03:00
miterosan	f1ceea8361	style fixes	2019-07-02 17:25:12 +02:00
miterosan	778c36c7d7	Allow discover of rulesets that are already loaded.	2019-07-02 17:05:04 +02:00
Salman Ahmed	744e651a37	Merge branch 'master' into applicable-to-hud	2019-07-02 05:24:56 +03:00
Salman Ahmed	a8e8650ddd	Move blocking fail logic into a base class	2019-07-02 01:47:39 +03:00
Dean Herbert	60ea3d4e1a	Fix skinning support for combobreak	2019-06-30 21:58:30 +09:00
iiSaLMaN	41597efdf7	Hide health bar in no fail	2019-06-29 04:25:52 +03:00
iiSaLMaN	d37cefbad8	Implement IApplicableToHUD	2019-06-29 04:23:59 +03:00
smoogipoo	a6ee83eac2	Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders	2019-06-27 19:57:21 +09:00
Dean Herbert	ba48331fcb	Remove no longer necessary HandleInput overrides	2019-06-27 18:34:59 +09:00
smoogipoo	6ce86e6083	General refactoring	2019-06-26 17:52:25 +09:00
Andrei Zavatski	4a05c560cf	Remove unwanted class and move the bind logic outside the RulesetSelector	2019-06-24 23:13:28 +03:00
Andrei Zavatski	35db20a337	Remove useless bindable check	2019-06-24 02:01:00 +03:00
Andrei Zavatski	60ff497add	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-24 01:06:54 +03:00
David Zhao	de59e038ac	Prevent non-combo affecting judgements from triggering sudden death	2019-06-21 14:29:16 +09:00
Andrei Zavatski	413c2158e2	Simplify bindables usage	2019-06-18 01:11:05 +03:00
Andrei Zavatski	c95e3da3ec	Implement a BindableRulesetSelector	2019-06-18 00:23:00 +03:00
Andrei Zavatski	cecbcd21b2	Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor	2019-06-17 23:12:55 +03:00
smoogipoo	2e7922c3f9	Fix 0-length sliders not getting correct lengths	2019-06-15 23:53:28 +09:00
Dean Herbert	cf713fbacc	Merge branch 'master' into fix-stacking-shaking	2019-06-14 22:16:35 +09:00
smoogipoo	4818187d8f	Reset result timeoffset to 0 when rewound	2019-06-13 14:55:52 +09:00
smoogipoo	27fdda8b91	Don't update hitobject results when rewinding	2019-06-13 12:21:49 +09:00
EVAST9919	e5a6d920cd	Implement an abstract RulesetSelector class	2019-06-12 23:23:01 +03:00
Dean Herbert	00ee45fe46	Merge remote-tracking branch 'origin/update-visibility-container' into update-framework	2019-06-11 19:36:13 +09:00
Dean Herbert	5c2c4f0ada	Merge pull request #4878 from HoLLy-HaCKeR/expose-skills ... Expose skills in DifficultyAttributes	2019-06-11 18:47:56 +09:00
Arphox	07e17518e9	Fix all "Maintainability" CodeFactor issues	2019-06-11 10:28:16 +02:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Dan Balasescu	346c4310c3	Merge branch 'master' into fail-animation	2019-06-07 20:48:36 +09:00
smoogipoo	c7d0fcd42a	Update drawnodes	2019-06-06 16:49:35 +09:00
Dean Herbert	9c214c3f0e	Add animation on failing	2019-06-04 16:13:16 +09:00
HoLLy	2a295545a7	Don't mutate strainPeaks	2019-05-29 11:25:25 +02:00
HoLLy	7e9f5a0939	Add Skills to DifficultyAttributes	2019-05-29 11:22:51 +02:00
Paul Teng	1c3b768266	Use Precision.AlmostBigger	2019-05-12 09:02:22 -04:00
Paul Teng	1a6c8e91a5	Compare Health with small value	2019-05-12 08:44:20 -04:00
smoogipoo	3fe61c4a7e	Trim whitespace	2019-05-10 18:48:39 +09:00
Dan Balasescu	425154c264	Merge branch 'master' into progress-bar-show-seek	2019-05-10 18:24:15 +09:00
smoogipoo	ad4b4f3422	Use nullable cancellation tokens	2019-05-10 17:42:45 +09:00
Dean Herbert	a44296a6db	Merge branch 'master' into progress-bar-show-seek	2019-05-10 17:27:49 +09:00
Dean Herbert	21ab628f41	Merge branch 'master' into player-load-cancellations	2019-05-10 16:58:36 +09:00
smoogipoo	d25d39b315	Add cancellation to storyboard/hitobject loading	2019-05-10 16:31:09 +09:00
Dan Balasescu	32808a8a59	Merge branch 'master' into fix-long-skip-performance	2019-05-10 16:10:50 +09:00
David Zhao	5c096cbc91	Revert mirroring condition too	2019-05-09 18:59:00 +09:00
David Zhao	9e0af723cc	Split out affectscombo change	2019-05-09 18:56:19 +09:00
Dean Herbert	9248e6290c	Use FrameStabilityClock to denote current position on song progress	2019-05-09 18:09:26 +09:00
Dean Herbert	3bcfc86b9c	Allow custom MaxCatchUpFrames to be specified ... Also adjusts the default to allow for smoother seeking.	2019-05-09 16:39:03 +09:00
Dean Herbert	66594b7a1b	Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start	2019-05-09 16:39:03 +09:00
David Zhao	b0e34d86d5	Subtract a result from count if its been reverted	2019-05-09 16:16:20 +09:00
David Zhao	39fb5712f1	Only combo-incrementing results add to result count	2019-05-09 15:31:37 +09:00
smoogipoo	39efa2d173	Fix possible cross-thread config cache access	2019-05-08 19:05:00 +09:00
smoogipoo	117f8bdd01	Merge remote-tracking branch 'Joehuu/master' into flashlight-dim	2019-05-08 13:25:01 +09:00
smoogipoo	13b9b04bb8	Apply more cases/fix some existing ones	2019-05-07 13:23:09 +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
David Zhao	abc163fa36	Fix merge	2019-05-07 12:07:45 +09:00
David Zhao	732b0b22a3	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-05-07 12:04:58 +09:00
Dean Herbert	6bdaca1e3b	Fix mod equality checks not working as intended	2019-05-03 10:09:47 +09:00
Dean Herbert	6a4dc5e25c	Improve xmldoc slightly	2019-05-02 14:03:58 +09:00
iiSaLMaN	ddd9262384	fix xmldoc	2019-04-30 19:08:31 +03:00
iiSaLMaN	3b03ca802a	Merge branch 'master' into sh-xh-grading-2	2019-04-30 18:55:35 +03:00
iiSaLMaN	148f4c4ce0	Pass Rank.Value instead ... Passing Rank.Value along each iteration instead of calculating.	2019-04-30 18:49:31 +03:00
iiSaLMaN	e0abd0b2c1	fix comment	2019-04-30 18:44:31 +03:00
iiSaLMaN	665558c297	Remove unnecessary comment	2019-04-30 18:44:06 +03:00
iiSaLMaN	5d50316ae7	Add xmldoc	2019-04-30 18:12:27 +03:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
iiSaLMaN	b08fb5136e	Merge branch 'master' into sh-xh-grading-2	2019-04-26 10:38:10 +03:00
David Zhao	9da13cb463	Merge branch 'master' into flashlight-dim	2019-04-25 23:15:15 +09:00
KingLuigi4932	619071b7ee	Unnecessary 'using' directive	2019-04-25 14:23:00 +03:00
KingLuigi4932	4e0f21102b	Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2	2019-04-25 14:04:12 +03:00
KingLuigi4932	c6b3197dd0	Add AdjustRank and use it in Hidden Mod	2019-04-25 13:56:57 +03:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
iiSaLMaN	d3bc443810	Merge branch 'master' into sh-xh-grading-2	2019-04-25 06:11:07 +03:00
Dean Herbert	4f31eee5ad	Merge branch 'master' into flashlight-dim	2019-04-24 17:01:11 +09:00
Dean Herbert	60328cf1fb	Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek	2019-04-24 15:25:53 +09:00
Dean Herbert	80e1568e97	Fix FrameStabilityContainer performing frame-stable seeks	2019-04-24 15:25:52 +09:00
iiSaLMaN	a29c7d81ee	Merge branch 'master' into sh-xh-grading-2	2019-04-23 10:31:17 +03:00
David Zhao	9890884726	Remove fade in, update comment	2019-04-23 14:23:09 +09:00
smoogipoo	6c568d228f	Add comment	2019-04-23 13:45:51 +09:00
smoogipoo	6add395288	Fix gameplay cursor being hidden in tests/replays	2019-04-23 13:32:44 +09:00
iiSaLMaN	a6b60a2fc2	Merge branch 'master' into sh-xh-grading-2	2019-04-22 19:39:20 +03:00
Dean Herbert	5313ba2938	Merge branch 'master' into hp-rewind	2019-04-22 19:02:41 +09:00
Dean Herbert	908eee9942	Fix pause tests	2019-04-22 18:29:51 +09:00
smoogipoo	aeae759fcd	Rename method + add xmldoc	2019-04-22 18:08:15 +09:00
smoogipoo	4edb17a88a	Make hp work + cleanup	2019-04-22 18:02:49 +09:00
smoogipoo	fbb4e9df04	Implement hp at base ScoreProcessor	2019-04-22 16:51:38 +09:00
David Zhao	3fbbb7dcf9	Move intiial fade outside of absolute sequence	2019-04-22 16:39:28 +09:00
iiSaLMaN	cfb3c38c3a	Fix.	2019-04-22 10:14:19 +03:00
iiSaLMaN	9030935030	Fix AppVeyor Errors	2019-04-22 10:07:45 +03:00
iiSaLMaN	64429aa968	Fix AppVeyor Errors	2019-04-22 09:59:51 +03:00
iiSaLMaN	7a385e56ec	Fix AppVeyor Errors	2019-04-22 09:58:29 +03:00
iiSaLMaN	c784bc4418	Remove whitespaces	2019-04-22 06:15:37 +03:00
iiSaLMaN	de542ca202	Remove bindable and use property	2019-04-22 06:14:14 +03:00
iiSaLMaN	26f0b2a4fe	Remove bindable ... Bad usage	2019-04-22 06:12:41 +03:00
iiSaLMaN	cff319e0d8	Fix issue	2019-04-21 18:12:50 +03:00
iiSaLMaN	c5bf01cc5c	Fix issue	2019-04-21 18:05:52 +03:00
iiSaLMaN	b200142afb	Make AdjustRank Bindable and fix issue	2019-04-21 17:55:01 +03:00
iiSaLMaN	77614189c9	Make AdjustRank Bindable	2019-04-21 17:48:50 +03:00
iiSaLMaN	4e07975e7c	Ranks must be adjusted in Hidden Mod	2019-04-21 15:58:40 +03:00
iiSaLMaN	73da423639	Adjust rank	2019-04-21 15:58:19 +03:00
David Zhao	037e23247f	Remove unused using	2019-04-18 14:31:47 +09:00
David Zhao	dfa5beea89	Use the actual scale of Flashlight for FlashlightSize	2019-04-18 14:24:19 +09:00
Dean Herbert	879f6152b0	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-04-17 22:17:10 +08:00
smoogipoo	ac2eabc9bf	Fix replay rewinding not respecting 60fps playback	2019-04-16 17:47:00 +09:00
David Zhao	e25c7fdb9b	Use absolute sequence for flashlight breaks	2019-04-12 17:39:25 +09:00
David Zhao	846a4835ca	Invert flashlight dim	2019-04-12 11:23:40 +09:00
David Zhao	664a4ba540	Implement flashlight dimming on slider slide	2019-04-12 10:47:22 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	7845d542e3	Cache mods as array in DrawableRuleset	2019-04-10 17:20:36 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
RORIdev	ca6a73cb9d	Fixed Code Inspection Fails.	2019-04-04 18:04:49 -03:00
RORIdev	c195481223	Trimmed Whitespace	2019-04-04 13:28:43 -03:00
RORIdev	5a3e5036ed	All suggestions were applied.	2019-04-04 13:21:53 -03:00
RORIdev	27fe6f610a	Removed deprecated code. Thanks peppy.	2019-04-03 22:55:09 -03:00
RORIdev	ff1815e714	Fixed lives being not reseting between maps. ... E.G. quitting a map with only 1 revive and getting 2 lives on another map.	2019-04-03 20:22:48 -03:00
RORIdev	28bf3156ba	Fixed the mod being not resetting.	2019-04-03 19:32:29 -03:00
RORIdev	5aa284781e	Reverted back Player.cs changes.	2019-04-03 19:20:20 -03:00
RORIdev	ebaaaef4d6	Fixed Inconsistent Naming	2019-04-03 18:17:21 -03:00
RORIdev	621f8fd78d	Trimmed whitespaces.	2019-04-03 18:05:47 -03:00
RORIdev	f6e1cb07a1	Changed the logic to ModEasy.	2019-04-03 17:58:17 -03:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	d8af5e1c5a	Update in-line with drawnode changes	2019-04-02 11:56:22 +09:00
Dean Herbert	184403c7e1	Merge branch 'master' into resume-cursor-2	2019-04-01 14:24:00 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	79b5c2482b	Merge pull request #4562 from peppy/fix-editor-blueprints ... Fix editor blueprints being misplaced	2019-04-01 11:17:17 +09:00
Dean Herbert	6896ec7731	Remove unnecessary method	2019-04-01 10:39:55 +09:00
Dean Herbert	d1a175675d	Use variable	2019-04-01 10:37:02 +09:00
Dean Herbert	5d91c3bcfc	Fix replay handler nullref crashes	2019-03-31 01:33:56 +09:00
Dean Herbert	42eaabe24c	Fix editor blueprints being misplaced ... Regressed with PlayfieldAdjustmentContainer changes.	2019-03-31 01:29:37 +09:00
Dean Herbert	6949c233bf	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 15:02:12 +09:00
Dean Herbert	3e8952b087	Merge pull request #4521 from peppy/hitobject-drawable-representation ... Fix DrawableRuleset drawable creation method's name	2019-03-29 14:08:23 +09:00
Dean Herbert	c72705217a	Merge branch 'master' into framed-replay-handler-fixes	2019-03-29 12:59:51 +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	e7b38cdc75	Remove unnecessary set	2019-03-29 12:38:47 +09:00
Dean Herbert	5b0aa7bf8d	Split out current/next frame conditionals for readability	2019-03-29 12:38:40 +09:00
Dean Herbert	fed58fba3a	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 12:14:28 +09:00
Dean Herbert	ed0bf59e73	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:51:44 +09:00
Dan Balasescu	bab7d78130	Remove redundant cast ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-29 11:36:40 +09:00
Dean Herbert	785433bb74	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:25:54 +09:00
Dan Balasescu	d410054ec8	Merge branch 'master' into key-counter-display	2019-03-29 11:22:59 +09:00
Dean Herbert	7715606188	Merge branch 'master' into sprite-icon-compatibility	2019-03-29 11:15:34 +09:00
Dan Balasescu	772f0cac8a	Merge branch 'master' into gameplay-cursor-last-state	2019-03-29 11:01:13 +09:00
Dan Balasescu	7ab24e35f9	Merge branch 'master' into gameplay-paused-no-update	2019-03-29 10:53:32 +09:00
Dean Herbert	8642886ffa	Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust	2019-03-29 00:39:51 +09:00
Dean Herbert	70f99400ad	Fix many behavioural issues and add tests	2019-03-28 19:28:13 +09:00
Dean Herbert	148e26a6d4	Fix FramedReplayInputHandler starting at frame 0 when it shouldn't	2019-03-28 12:42:57 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	3fcbc2eab3	Fix key counter getting overridden	2019-03-27 10:31:21 +09:00
Dean Herbert	15821c7511	Fix cursor adding	2019-03-26 17:04:14 +09:00
Dean Herbert	dde7788c44	Merge branch 'universal-playfield-adjust' into resume-cursor-2	2019-03-26 13:58:48 +09:00
Dean Herbert	fb302e7ad8	Remove using	2019-03-26 13:58:07 +09:00
Dean Herbert	8658de5108	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 13:52:48 +09:00
Dean Herbert	27cb4ce0d1	Remove poop	2019-03-26 13:48:35 +09:00
Dean Herbert	fbc97edc55	Add base cursor class to retrieve true visibility state	2019-03-26 13:41:30 +09:00
Dean Herbert	b4d785c76c	Don't update gameplay loop while paused	2019-03-26 13:36:17 +09:00
Dean Herbert	ed3746e166	Make PlayfieldAdjustmentContainer universal	2019-03-26 13:32:44 +09:00
Dean Herbert	b75ea295db	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 11:28:43 +09:00
Dean Herbert	82140c38fc	Apply CI fixes	2019-03-25 22:00:33 +09:00