242 Commits

Author	SHA1	Message	Date
Dean Herbert	c57fecd1fc	Update comment to make it clear this is a hack	2020-10-20 12:43:57 +09:00
Joehu	fef6e55b39	Remove unused using and field	2020-10-19 12:32:16 -07:00
Joehu	dbda18acea	Fix autoplay/replay settings going off screen on some legacy skins	2020-10-19 12:04:23 -07:00
Dean Herbert	77bf050a80	Ignore IgnoreHits for flashiness	2020-10-16 17:24:43 +09:00
Dean Herbert	a810f56ec8	Move "flash on hit only" logic to binding	2020-10-16 17:08:46 +09:00
Dean Herbert	c0a1f2158c	Add basic component structure for skinnable health displays	2020-10-16 17:08:46 +09:00
Dean Herbert	d76365ed1b	Make container readonly	2020-10-15 18:38:41 +09:00
Dean Herbert	6983978c98	Correct top-right element offset by finding the lower top anchor element	2020-10-15 18:30:44 +09:00
Dean Herbert	254eba9008	Add and consume skinnable accuracy counter	2020-10-15 17:53:16 +09:00
Dean Herbert	d8d085ede9	Align top-right elements with lowest point in score display	2020-10-15 17:14:42 +09:00
Dean Herbert	950c47287c	Fix positioning of score display in HUD overlay	2020-10-15 17:14:42 +09:00
Dean Herbert	e1da64398e	Add and consume skinnable score counter	2020-10-15 17:14:42 +09:00
Dean Herbert	2fce064e32	Add basic legacy combo counter and updating positioning logic	2020-10-14 19:16:34 +09:00
Dean Herbert	f5623ee21e	Setup skinnable combo counter component with default implementation	2020-10-14 19:16:34 +09:00
Dean Herbert	98acf1e31d	Make field read only	2020-10-14 19:16:25 +09:00
Dean Herbert	a7f8e26e35	Adjust bottom-right elements positions based on song progress display	2020-10-14 18:51:53 +09:00
Dean Herbert	ace9fbc8d3	Confine available area for HUD components to excluse the song progress area	2020-10-14 18:44:22 +09:00
Salman Ahmed	8f1a71c6b1	Remove counter sprite attributes for not being of any reasonable use	2020-08-19 07:44:45 +03:00
Dean Herbert	fea6389f69	Hide HUD elements during break time by default	2020-07-22 12:41:06 +09:00
Bartłomiej Dach	a63b6a3ddf	Simplify binding	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	798e8e7a8d	Fix CI fail	2020-06-26 15:12:01 +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
Dean Herbert	4976f80b71	Move implementation to HUD	2020-04-09 14:31:25 +09: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
Dean Herbert	997b49f6dc	Change display to always show progress bar, only hiding seeking handle instead	2020-01-24 14:21:22 +09:00
smoogipoo	76f2fb378f	Separate score and health parts of ScoreProcessor	2019-12-19 20:03:14 +09:00
smoogipoo	a276643a4b	Reorder health display and score elements	2019-12-16 18:41:14 +09:00
smoogipoo	83f77d9c35	Make the layout faster	2019-12-16 18:41:02 +09:00
Dean Herbert	94f3dbb2f6	Adjust transitions slightly	2019-12-12 16:09:50 +09:00
Dean Herbert	3ccfee64f6	Add HUDOverlay tests	2019-12-12 16:09:42 +09:00
Dean Herbert	ffb5cdc6ae	Hide settings overlay along with other HUD-hidden content	2019-12-12 15:20:42 +09:00
Dean Herbert	ad2528d4d2	Hide key counter along with other hud elements ... Also tidies up HUD hide logic and protects against incorrect hiding.	2019-12-12 15:19:45 +09:00
Dean Herbert	158737e001	Remove FadeTime customisation ... Also adjusts fade transitions to feel better, especially in fast forward scenarios.	2019-09-12 14:27:29 +09:00
Dean Herbert	4cad55cee6	Move hit windows lookup to DrawableRuleset	2019-09-03 13:05:03 +09:00
smoogipoo	0a89603e79	Fix hit error potentially not displaying with null hitwindows	2019-09-02 16:07:16 +09:00
Dean Herbert	f1db6c7039	Fix likely nullref	2019-08-30 20:18:21 +09:00
Dean Herbert	665fc95d49	Handle no hitobjects / no hitwindows (osu!catch)	2019-08-30 19:37:20 +09:00
Dean Herbert	8fc177b743	Fix namespacing and hitwindow source	2019-08-30 18:46:42 +09:00
Dean Herbert	bdbfa7bd2f	Fix class naming	2019-08-30 15:32:47 +09:00
Andrei Zavatski	9f64e09625	Move HitErrorDisplayOverlay back to the HUD	2019-08-20 08:45:51 +03:00
Andrei Zavatski	1bff103d32	CI fixes	2019-08-19 21:25:14 +03:00
Andrei Zavatski	70084b5553	Move HitErrorDisplay outside of the HUD	2019-08-19 20:28:03 +03:00
Andrei Zavatski	4c817b18b7	Use direct cast	2019-08-18 17:03:11 +03:00
Andrei Zavatski	dd6351b8ca	Apply suggested changes	2019-08-18 16:51:16 +03:00
Andrei Zavatski	8740ebd13f	Simplify layout	2019-08-18 15:45:18 +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	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	8f2ec73626	Move logic inside of HUDOverlay ... Add vertical offset adjust.	2019-07-07 05:30:53 +09:00
Salman Ahmed	8b4ef52c13	Revert unnecessary changes	2019-07-03 07:27:24 +03:00
Salman Ahmed	6a79349f4a	Move health display out of the visibility container	2019-07-02 02:19:59 +03:00
smoogipoo	bde2d552b6	Merge remote-tracking branch 'origin/master' into fix-more-pause-cases ... # Conflicts: # osu.Game.Tests/Visual/Gameplay/TestCasePause.cs	2019-05-10 22:16:59 +09:00
smoogipoo	01eb1a34a9	Remove unused variable	2019-05-10 22:15:33 +09:00
smoogipoo	6a957ad27f	Fix pause triggered when already paused	2019-05-10 15:51:12 +09:00
smoogipoo	7c105fd99f	Fix testcase players pausing on window unfocus	2019-05-10 15:39:25 +09:00
Dean Herbert	9248e6290c	Use FrameStabilityClock to denote current position on song progress	2019-05-09 18:09:26 +09:00
Dean Herbert	9457a6128e	Fix game pausing when made inactive while watching a replay	2019-05-09 10:57:55 +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
Dean Herbert	8658de5108	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 13:52:48 +09:00
Dean Herbert	5f288650bf	Fix misses/typos	2019-03-20 14:49:33 +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
Dean Herbert	58ef397f4f	Move all clock related gameplay logic inside GameplayClockContainer	2019-03-07 16:02:24 +09:00
Dean Herbert	01f1018d02	Tidy up clock logic using DI and a GameplayClock	2019-03-05 13:37:51 +09:00
Dean Herbert	e2c6a8bc07	Use pattern matching wherever possible	2019-02-28 14:35:00 +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
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	c18ce2c23a	Formatting fixes	2019-01-23 14:51:25 +09:00
chrisny286	12503b4d07	revert and make VisibilityContainer not AlwaysPresent	2019-01-23 02:37:17 +01:00
chrisny286	cabcfffdeb	Fix autoplay rewind/skip usable when UI hidden	2019-01-23 01:16:37 +01:00
Dean Herbert	b373d78143	Add slight easing	2019-01-22 09:47:51 +09:00
Dean Herbert	25b5bbcd8f	Merge branch 'master' into score-panel-layout	2019-01-22 09:43:37 +09:00
chrisny286	d7d2e2fe44	trimmed whitespace	2019-01-21 19:22:19 +01:00
chrisny286	65fd69c817	Update HUDOverlay.cs ... separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container	2019-01-21 19:10:29 +01:00
ekrctb	e74f0057bd	Automatically layout based on score display width	2019-01-21 17:07:56 +09:00
ekrctb	f982b6da55	Don't hide 'hold for menu' even hud is hidden	2019-01-17 16:49:04 +09:00
smoogipoo	ca91dfa091	Make hudoverlay always present	2018-12-04 19:20:32 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Roman Kapustin	ecf8a89f26	Set AccentColour and GlowColour in StandardHealthDisplay	2018-11-16 19:30:58 +03:00
Roman Kapustin	37b19f78ae	Set AccentColour in concrete counters	2018-11-15 23:37:21 +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
Paul Teng	4bc9161cd1	Leave bigger gap if replaying	2018-10-30 08:32:12 -04: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
Roman Kapustin	125b569ccb	Change AudioClock type to IFrameBasedClock and comment its usage	2018-09-07 21:39:41 +03:00
Roman Kapustin	1e6220e3c0	Call KeyCounter.RestoreState itself	2018-07-28 13:22:52 +03:00
Roman Kapustin	d387048057	Resolve KeyCounterCollection merge conflict	2018-07-22 21:15:53 +03:00
Roman Kapustin	7f3ad37ede	Restore keycounter state on replay seek	2018-07-22 19:42:18 +03:00
Roman Kapustin	1d9bf42082	Fix clock assigning during KeyCounterCollection creation	2018-07-22 18:38:10 +03:00
Roman Kapustin	72959691e9	Introduce KeyCounterMemento	2018-07-22 17:16:17 +03:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	241437c819	Remove unnecessary counting change logic	2018-07-20 17:08:25 +09:00
Dean Herbert	d43e4af8ea	Fix overlap between quit button at key input overlay	2018-05-22 16:45:42 +09:00
Roman Kapustin	39db1e8cbb	Rename HoldToQuit to QuitButton	2018-05-03 23:50:30 +03:00
TocoToucan	633c775306	Initial HoldToQuit commit	2018-04-21 18:24:31 +03:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	8e78a7b114	Fix HUD using incorrect clock for time display	2018-02-27 17:23:38 +09:00
Dean Herbert	d4f1723ae6	Remove unnecessary secondary argument from HUDOverlay	2018-02-27 17:23:38 +09:00
TocoToucan	d82835107c	Remove autohide and clock related logic from Visual settings overlay	2018-01-26 22:20:24 +03:00
TocoToucan	615c831069	Merge from ppy/master	2018-01-26 21:56:17 +03:00
smoogipoo	8d11596b2f	Minor cleanups	2018-01-24 17:48:42 +09:00
TocoToucan	e88f514cf4	Resolve merge conflicts	2018-01-21 18:32:21 +03:00
TocoToucan	4875443e12	Resolve merge conflicts	2018-01-21 18:11:43 +03:00
smoogipoo	a05032779f	Remove unneeded event binding	2018-01-18 00:04:33 +09:00
smoogipoo	c79603290d	Move TriggerChange to LoadComplete()	2018-01-17 21:52:57 +09:00
smoogipoo	2ebb3d6e0e	Fix ReplayLoader not being treated as having a replay loaded ... Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.	2018-01-17 17:37:14 +09:00
TocoToucan	43d2ae348a	Rename ReplaySomething -> PlayerSomething	2018-01-13 22:25:09 +03:00
TocoToucan	3795411fd1	Do not assign hudOverlay's and breakOverlay's members in Player class	2018-01-12 23:33:24 +03:00
TocoToucan	3ec93966a0	Implement VisualSettings autohiding	2018-01-11 23:39:23 +03:00
TocoToucan	98851e4a78	Stop time whenever visual settings are expanded	2018-01-11 01:24:34 +03:00
TocoToucan	c48c7b085c	Visual settings initial commit	2018-01-10 02:24:51 +03:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
EVAST9919	1c132938df	Allow visibility can be toggled only if replay is loaded	2017-10-03 20:26:53 +03:00
EVAST9919	b94c78e993	Hide/Show Replay settings on pressing Ctrl+H	2017-10-02 19:33:58 +03:00
EVAST9919	6d97da8b19	Add replay speed adjustment	2017-10-02 04:42:38 +03:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
Dean Herbert	723e27353c	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Dean Herbert	f705589bf2	Rename NotificationManager to NotificationOverlay	2017-07-28 15:03:42 +09:00
Thomas Müller	99221260c4	Replace several usages of BeginDelayedSequence with LINQ-style	2017-07-16 17:42:01 +03:00
Dean Herbert	5568df1aee	Remove StandardHUDOverlay ... This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now. We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.	2017-06-05 17:18:07 +09:00
Dean Herbert	2712f49545	Remove bad	2017-06-05 17:06:47 +09:00
Dean Herbert	958cd9f8d8	Don't display in-game ... Nothing does anything yet, so we can't display this. Make it functional before adding to game project.	2017-06-05 16:52:09 +09:00
Dean Herbert	af6f8bbd89	Fix namespaces and class names	2017-06-05 16:47:42 +09:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
EVAST9919	08219ccb42	Applied suggested changes	2017-05-29 19:00:29 +03:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
EVAST9919	2e28b10c36	CI fixes and removed useless property	2017-05-23 12:24:16 +03:00
EVAST9919	eafe215169	Simplify Hud visibility change	2017-05-23 11:53:12 +03:00
EVAST9919	d717ccf85e	Settings -> ReplaySettings	2017-05-22 09:07:08 +03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
EVAST9919	1a4025ab3c	ingame options basic logic	2017-05-17 10:36:57 +03:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
Dean Herbert	48368779ab	Avoid polluting Player with HUD-specific code.	2017-05-08 11:48:40 +09:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00