307 Commits

Author	SHA1	Message	Date
Bartłomiej Dach	415e1c05ff	Simplify implementation	2020-06-26 19:39:55 +02:00
Bartłomiej Dach	3783fe8d6a	Rename fields for clarity	2020-06-26 19:39:53 +02:00
Power Maker	efeaa1cc10	Make some changes, fix and add tests	2020-06-26 14:58:42 +02:00
Power Maker	97a212a7f6	Hide red tint based on "Show health display even when you can't fail" setting	2020-06-26 14:32:01 +02:00
alex	0e2ccac33b	Add spaces to comments	2020-05-04 18:36:24 -07:00
smoogipoo	f3dbddd75c	Update bindings in LoadComplete()	2020-04-14 15:52:38 +09:00
smoogipoo	b8b334ca27	Always unbind bindings	2020-04-14 15:21:56 +09:00
smoogipoo	3183827329	Reorder fields	2020-04-14 15:09:31 +09:00
smoogipoo	7d2d0785fd	Fix potential unsafe ordering of binds	2020-04-14 15:07:32 +09:00
Dean Herbert	c5005eb378	Adjust gradient size slightly and make const	2020-04-09 14:55:02 +09:00
Dean Herbert	5a78e74470	Use Lerp instead of ValueAt	2020-04-09 14:51:50 +09:00
Dean Herbert	c44957db3f	Change initial health to 1 to avoid false fail display	2020-04-09 14:49:09 +09:00
Dean Herbert	947745d87e	Change fail effect to be less distracting	2020-04-09 14:34:23 +09:00
Dean Herbert	4976f80b71	Move implementation to HUD	2020-04-09 14:31:25 +09:00
Dean Herbert	0e2d5213ce	Merge branch 'master' into low-hp-red-layer	2020-04-09 13:53:57 +09:00
Joehu	0f11ecce01	Make icons container private	2020-04-05 14:53:49 -07:00
Joehu	493b654011	Remove horizontal margin from mod display ... Can skew center alignment on fill flow containers. Fixes affected areas. Vector2(5, 0) is similar to MarginPadding { Left = 10 }.	2020-04-03 11:30:02 -07:00
Lucas A	1562612f41	Update visual tests and remove unessecary XMLDoc tag	2020-04-01 15:12:31 +02:00
Lucas A	3cae0cedee	Add a game setting to disable the layer	2020-03-30 12:59:39 +02:00
Lucas A	c1ac57e70f	Add back visual tests and add easing to alpha fade.	2020-03-26 12:14:44 +01:00
Lucas A	a4171253a3	Make LowHealthThreshold a field.	2020-03-18 21:45:01 +01:00
Lucas A	e9f224b5e8	Apply review suggestions	2020-03-18 21:16:54 +01:00
Lucas A	a1274a9eb0	Fix and add missing XMLDoc	2020-03-18 08:29:00 +01:00
Lucas A	ed4f9f8ba9	Bind every HealthDisplay on Player load	2020-03-17 22:57:47 +01:00
Lucas A	6b0c5bc65d	Rename to LowHealthLayer to FaillingLayer.	2020-03-17 22:32:07 +01:00
Lucas A	1aacd1aaa2	Initial implementation of LowHealthLayer	2020-03-16 21:04:59 +01:00
Dan Balasescu	5b8035052f	Merge branch 'master' into fix-hit-error-ticks-outside-bounds	2020-03-09 09:16:51 +09:00
Lucas A	0953751d24	Clamp relative position of judgement ticks in range [0;1]	2020-03-08 15:51:57 +01:00
Dean Herbert	ed2bdd7106	Fix stutter when showing game HUD after being hidden for a while	2020-02-26 20:45:57 +09:00
Dean Herbert	560cf21b12	Add lenience to comparison ... Noticed that they could still stack up on maps with hitcircles at the same point in time (centipede).	2020-02-23 05:29:17 +09:00
Dean Herbert	e8ebb31517	Expire old judgement lines if too many exist	2020-02-23 03:53:51 +09:00
Dean Herbert	3daa49f1bd	Clean up old judgement lines if too many are already present	2020-02-23 03:39:12 +09:00
Dean Herbert	5aa5a1bbdd	Reduce transform time of judgement lines (visually looks almost the same)	2020-02-23 03:36:15 +09:00
smoogipoo	d4f14e552a	Improve extensibility of mod display expansion	2020-02-13 18:05:53 +09:00
Dean Herbert	bea20efb64	Merge branch 'master' into mod_content_centering	2020-01-30 10:34:46 +09:00
Bartłomiej Dach	c9dda78ded	Refactor drawable hierarchy to center properly ... * Use FillFlowContainer.Spacing instead of manually applying margins. * Use Update() for calculating button padding to preserve it after mod button expansion and adjust FooterButtonRandom to use this method while avoiding flickering. * Expose mod display margin to clear it in the footer button.	2020-01-29 18:59:51 +01:00
Dean Herbert	eb5abcab8c	Rename and simplify circle logic	2020-01-24 12:01:40 +09:00
Dean Herbert	851b891285	Fix incorrect insert logic	2020-01-24 12:01:14 +09:00
Dean Herbert	c390348eab	Merge remote-tracking branch 'upstream/master' into colour-score-meter	2020-01-24 11:45:33 +09:00
Dean Herbert	7c62cc3ac3	Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework	2020-01-22 22:57:52 +09:00
smoogipoo	7b2f58eb30	Apply OnRelease method signature refactorings	2020-01-22 13:22:34 +09:00
smoogipoo	bfb056c612	Apply input method signature refactorings	2020-01-20 18:17:21 +09:00
smoogipoo	91735ff367	Update MathUtils namespace usages	2020-01-09 13:43:44 +09:00
Andrei Zavatski	7a0d76ae77	Fix nullref	2019-12-22 03:41:19 +03:00
Andrei Zavatski	aded12af9e	Refactoor to avoid bindable usage	2019-12-22 03:30:17 +03:00
Andrei Zavatski	eb75c6c70f	Update FadeIn animation for new judgement	2019-12-22 03:17:56 +03:00
Andrei Zavatski	46501cf0ac	Use FillFlowContainer	2019-12-22 03:06:57 +03:00
Andrei Zavatski	14a77a8f16	Improve animations	2019-12-21 16:08:28 +03:00
Andrei Zavatski	b61aa660c6	Move colours to HitErrorMeter class	2019-12-21 14:52:53 +03:00
Andrei Zavatski	5e3c3f2a90	Make judgements work	2019-12-21 14:30:41 +03:00
Andrei Zavatski	5b115d8d8a	Implement basic logic	2019-12-21 13:41:50 +03:00
Dean Herbert	3ccfee64f6	Add HUDOverlay tests	2019-12-12 16:09:42 +09:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08: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
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +08:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
Dean Herbert	46b44f4f99	Fix PlayerSettingsOverlay being shown by default	2019-10-28 18:37:58 +09:00
Dean Herbert	51bf600ea7	Use empty hitwindows instead of null	2019-10-09 19:08:31 +09:00
HDragonHR	faf8fe132e	Change bindable int to float	2019-10-02 12:26:46 +08:00
iiSaLMaN	2670a23e6f	Assign to field and move to load complete	2019-09-27 08:15:24 +03:00
iiSaLMaN	7904f77cd5	Bind event to activation delay change	2019-09-27 02:59:42 +03:00
iiSaLMaN	911094e790	Replace menu button text with "press for menu" on 0ms activation delay	2019-09-26 01:42:56 +03:00
Dean Herbert	f925e781a9	Refactor HitWindows for legibility	2019-09-06 15:24:14 +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	1ddf292ad6	Fix vertical alignment of hit error display ticks ... Wasn't correctly centered before.	2019-08-31 12:20:50 +09:00
smoogipoo	fc813347ac	Make JudgementLine private	2019-08-30 19:54:36 +09:00
smoogipoo	dfccc60361	Reorder HitErrorDisplay	2019-08-30 19:53:38 +09:00
smoogipoo	fab12fa9cd	Centre align the icons ... Seems to look better this way.	2019-08-30 19:53:38 +09:00
Dean Herbert	665fc95d49	Handle no hitobjects / no hitwindows (osu!catch)	2019-08-30 19:37:20 +09:00
Dean Herbert	80671cefd7	Final visual polish	2019-08-30 19:14:07 +09:00
Dean Herbert	c3abf0ccb7	Improve visuals	2019-08-30 18:50:38 +09:00
Dean Herbert	8fc177b743	Fix namespacing and hitwindow source	2019-08-30 18:46:42 +09:00
Andrei Zavatski	70084b5553	Move HitErrorDisplay outside of the HUD	2019-08-19 20:28:03 +03:00
Andrei Zavatski	dd6351b8ca	Apply suggested changes	2019-08-18 16:51:16 +03:00
Andrei Zavatski	6c60db550f	Fix crash if ruleset has no Meh hit windows	2019-08-18 16:24:13 +03:00
Andrei Zavatski	55cd1cecdf	Add missing blank line	2019-08-18 15:53:42 +03:00
Andrei Zavatski	8740ebd13f	Simplify layout	2019-08-18 15:45:18 +03:00
Andrei Zavatski	a59a14c9e6	Add setting to enable/disable hit error visibility	2019-08-18 15:01:04 +03:00
Andrei Zavatski	ee5568e596	Use Queue instead of List for stored Judgements	2019-08-18 14:43:34 +03:00
Andrei Zavatski	50133ba863	naming adjustments	2019-08-18 02:57:12 +03:00
Andrei Zavatski	906984ad95	Fix the math	2019-08-18 02:49:07 +03:00
Andrei Zavatski	f7024b513e	Visual improvements	2019-08-18 01:43:43 +03:00
Andrei Zavatski	e7964c165f	Make judgement lines alive for a bit longer	2019-08-11 19:09:50 +03:00
Andrei Zavatski	3136d46c7f	Do not generate new judgement line on miss	2019-08-11 19:04:56 +03:00
Andrei Zavatski	5e0ac28ca8	Add basic colours	2019-08-11 18:30:03 +03:00
Andrei Zavatski	177a317a48	rename AccuracyBar to HitErrorDisplay	2019-08-11 18:11:49 +03:00
Andrei Zavatski	2a35c3c3e2	Calculate real position for judgement lines	2019-08-11 18:04:54 +03:00
Andrei Zavatski	0a255fe4d1	Add moving arrow	2019-08-11 16:38:03 +03:00
Andrei Zavatski	ed409d113b	Add judgement lines generator	2019-08-11 15:53:15 +03:00
Andrei Zavatski	fd334e0319	Implement basic layout for AccuracyBar	2019-08-11 14:57:21 +03:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
smoogipoo	6a957ad27f	Fix pause triggered when already paused	2019-05-10 15:51:12 +09:00
Dean Herbert	0693290ad4	Merge remote-tracking branch 'upstream/master' into refactor-select-footer	2019-05-08 18:43:21 +09:00
Dean Herbert	bace829629	Add ability to avoid expand animation in ModDisplay	2019-05-08 18:42:26 +09:00
Dean Herbert	8bc313fb33	Merge branch 'master' into fix-new-inspections	2019-05-07 14:14:40 +09:00
Dean Herbert	f7a570d67a	Fix double confirmation	2019-05-07 13:34:06 +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	3e3f12f277	Use more local bindables	2019-05-04 17:53:17 +09:00
Dean Herbert	b9a39fb788	Fix instant pausing when game becomes inactive ... Resolves #4685.	2019-05-04 14:54:29 +09:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
Dean Herbert	48e82d4b1c	Fix hold for menu button's icon being incorrect	2019-04-22 18:47:28 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +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
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	1be4c7b813	Fix excess newline	2019-03-12 02:23:23 +09:00
Dean Herbert	38e75421ab	Fix HoldForMenuButton getting stuck in a confirming state ... Closes #4446.	2019-03-12 02:21:34 +09:00
Dean Herbert	58ef397f4f	Move all clock related gameplay logic inside GameplayClockContainer	2019-03-07 16:02:24 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
smoogipoo	d61dfe888e	Fix venera fonts not being correctly specified	2019-02-22 19:42:09 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
chrisny286	fb51578df3	Update PlayerSettingsOverlay.cs ... Framework renamed this variable so it needs to be renamed here too.	2019-01-21 17:19:40 +01:00
smoogipoo	d93421b796	Merge remote-tracking branch 'Joehuu/master' into timeshift-wip ... # Conflicts: # osu.Game/Screens/Play/HUD/ModDisplay.cs	2018-12-22 14:02:45 +09:00
Dean Herbert	aaac45ab8c	Add ability to select chat tabs with alt-1-9	2018-12-20 21:50:47 +09:00
smoogipoo	170955110f	Add mods to the match info	2018-12-12 14:38:03 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Dean Herbert	970ea928ae	Fix hold for menu button occasionally disappearing	2018-11-19 12:06:47 +09:00
Roman Kapustin	ecf8a89f26	Set AccentColour and GlowColour in StandardHealthDisplay	2018-11-16 19:30:58 +03:00
Dean Herbert	7f73fc2d39	Require holding back button to quit gameplay ... Avoids accidental presses and streamlines logic with on-screen element.	2018-11-07 01:49:21 +09:00
ekrctb	b7a2ad1aa5	Use UIEvent level getters for modifier keys.	2018-10-02 13:26:36 +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
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
Dean Herbert	4a68b14447	Fix crash when selecting mods after entering play mode ... Closes #3260.	2018-08-21 00:15:51 +09:00
smoogipoo	3619290c34	Split out judgement definition from judgement result	2018-08-02 20:35:54 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
smoogipoo	0e122468db	Fix progress easing to 0 if aborting after confirmation	2018-05-22 18:06:40 +09:00
Dean Herbert	436067c01f	Handle scale back in a nicer way	2018-05-22 16:44:37 +09:00
Dean Herbert	7b770d03c5	Use OnMouseMove instead of Update logic	2018-05-22 16:26:59 +09:00
Dean Herbert	babb7d5158	Fix white ring flash when holding button post-confirmation	2018-05-22 16:23:05 +09:00
Dean Herbert	5f8eb6d823	Fix class name	2018-05-22 16:04:36 +09:00
Dean Herbert	8fbda9d57e	Improve comment	2018-05-22 16:04:07 +09:00
Dean Herbert	58ae545747	innerCircle -> overlayCircle	2018-05-22 15:59:53 +09:00
Dean Herbert	ef55c3c197	Fix icon scale not resetting due to no implicit triggering	2018-05-22 15:58:17 +09:00
Dean Herbert	2ce2bd9788	Add comment for pendingAnimation	2018-05-22 15:58:00 +09:00
Dean Herbert	5a892e4d08	This quit button don't quit	2018-05-22 02:09:52 +09:00
Dean Herbert	323aa189b6	Make on-confirmation animation more robust	2018-05-22 02:08:44 +09:00
Dean Herbert	946a75ddb2	Block hover to use UI cursor instead of gameplay cursor	2018-05-22 02:05:08 +09:00