2121 Commits

Author	SHA1	Message	Date
Dean Herbert	7a68636f71	Adjust fade sequence and durations to feel better	2020-10-20 15:03:33 +09:00
Dean Herbert	4e57751ca1	Fix background dim application to avoid overdraw, transition smoother	2020-10-20 15:03:12 +09:00
Dean Herbert	80b1f816c7	Merge branch 'master' into hide-hud-during-break-time	2020-10-20 14:19:04 +09:00
Dean Herbert	c57fecd1fc	Update comment to make it clear this is a hack	2020-10-20 12:43:57 +09:00
Bartłomiej Dach	fd4bab85cf	Merge branch 'master' into epilepsy-warning	2020-10-20 01:06:46 +02:00
Bartłomiej Dach	05251c646e	Fade volume back up on pop out	2020-10-20 01:06:20 +02:00
Bartłomiej Dach	1fc22bdbff	Only show warning once on given map	2020-10-20 00:59:36 +02:00
Bartłomiej Dach	a164d330e5	Improve feel of transition	2020-10-20 00:51:31 +02:00
Bartłomiej Dach	6e50ae0458	Reformulate push sequence code	2020-10-20 00:22:30 +02:00
Bartłomiej Dach	8505903041	Move warning construction to load()	2020-10-20 00:08:05 +02:00
Bartłomiej Dach	aeca61eb3e	Split warning to separate file	2020-10-19 23:48:02 +02:00
Bartłomiej Dach	44279ed347	Remove unused using directive	2020-10-19 23:46:09 +02:00
Salman Ahmed	6e4b28ed1e	Different version of epilepsy warning display	2020-10-20 00:32:44 +03: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
Dan Balasescu	b5cadd6a2c	Merge pull request #10555 from peppy/fix-score-display-zero-padding ... Fix incorrect zero padding for classic scoring mode	2020-10-19 15:54:12 +09:00
Dean Herbert	ba99c5c134	Remove rolling delay on default combo counter	2020-10-19 14:39:02 +09:00
Dean Herbert	cb1784a846	Fix score displays using non-matching zero padding depending on user score display mode	2020-10-19 14:05:28 +09:00
Dan Balasescu	b7c12ff61e	Merge pull request #10530 from peppy/fix-catch-dual-combo-counter ... Fix osu!catch showing two combo counters for legacy skins	2020-10-16 23:52:14 +09:00
smoogipoo	dfbc0965e4	Merge branch 'master' into peppy/skinnable-health-display	2020-10-16 23:17:17 +09:00
Dean Herbert	8a3bce3cc3	Fix osu!catch showing two combo counters for legacy skins	2020-10-16 18:20:17 +09:00
Dean Herbert	a774de2270	Also add support in LegacyComboCounter	2020-10-16 17:52:22 +09:00
Dean Herbert	77bf050a80	Ignore IgnoreHits for flashiness	2020-10-16 17:24:43 +09:00
Dean Herbert	f0b15813e2	Add support for both legacy styles	2020-10-16 17:08:46 +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
Dan Balasescu	583fdc3a95	Merge pull request #10510 from peppy/skinnable-accuracy-display ... Add legacy skinning support for accuracy display	2020-10-15 21:20:48 +09:00
Dan Balasescu	5d8cf87155	Merge pull request #10511 from peppy/bottom-error-display ... Add support for bottom-anchored hit error display	2020-10-15 20:51:09 +09:00
Dan Balasescu	70b050f212	Merge branch 'master' into skinnable-accuracy-display	2020-10-15 20:28:57 +09:00
Dan Balasescu	1ce0e83e59	Merge branch 'master' into skinnable-score-display	2020-10-15 19:16:03 +09:00
Dan Balasescu	93dfbd5d9e	Merge pull request #10505 from peppy/skin-disabler-refactor ... Move ISampleDisabler implementation to Player and FrameStabilityContainer	2020-10-15 19:14:52 +09:00
Dean Herbert	70806deba1	Add support for bottom-anchored hit error display	2020-10-15 19:14:02 +09:00
Dean Herbert	d76365ed1b	Make container readonly	2020-10-15 18:38:41 +09:00
Dan Balasescu	5640d33d1a	Merge branch 'master' into skin-disabler-refactor	2020-10-15 18:32:50 +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	b31a3fbabb	Add test	2020-10-15 18:11:30 +09:00
Dean Herbert	254eba9008	Add and consume skinnable accuracy counter	2020-10-15 17:53:16 +09:00
Dean Herbert	90ff8ff050	Merge branch 'skinnable-combo-counter' into skinnable-score-display	2020-10-15 17:52:06 +09:00
Dean Herbert	37e9f331ad	Simplify score font lookup	2020-10-15 17:49:55 +09:00
Dean Herbert	43e5cb90e2	Merge branch 'skinnable-combo-counter' into skinnable-score-display	2020-10-15 17:30:29 +09:00
Dean Herbert	9f51327e4b	Fix completely incorrect default positioning logic	2020-10-15 17:29:40 +09:00
Dean Herbert	5b5ba7df93	Remove unused offset	2020-10-15 17:22:34 +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	74c031cfbb	Fix ModOverlay not including "UNRANKED" text in size	2020-10-15 17:14:42 +09:00
Dean Herbert	b210147c2e	Update combo counter to read from default score display's position correctly	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	219cbec6bd	Split out DefaultScoreCounter and make ScoreCounter abstract	2020-10-15 16:32:30 +09:00
Dean Herbert	d5f2aab52e	Tidy up SkinnableComboCounter class slightly	2020-10-15 15:37:40 +09:00
Dean Herbert	e0210f5c4c	Ignore failed casts to make tests happy	2020-10-14 23:52:58 +09:00
Dean Herbert	e3eaba7b2c	Move ISampleDisabler implementation to Player and FrameStabilityContainer	2020-10-14 19:39:48 +09:00
Dean Herbert	ac4f56403d	Adjust size/position	2020-10-14 19:16:34 +09:00
Dean Herbert	7f5ea57bd4	Clean-up pass (best effort) on LegacyComboCounter	2020-10-14 19:16:34 +09:00
Dean Herbert	9bb8a43bce	Combine LegacyComboCounter and ComboCounter classes	2020-10-14 19:16:34 +09:00
Dean Herbert	fbbea48c8c	Add score text skinnability	2020-10-14 19:16:34 +09:00
Dean Herbert	2fce064e32	Add basic legacy combo counter and updating positioning logic	2020-10-14 19:16:34 +09:00
Dean Herbert	6a6718ebab	Allow bypassing origin/anchor setting of skinnable components ... It makes little sense to set these when using RelativeSizeAxes.Both	2020-10-14 19:16:34 +09:00
Dean Herbert	899bac6ca5	Rename catch combo counter for clarity	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	60603d2918	Add skin components and interfaces	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	0cf3e90904	Update SongProgress height based on its dynamic height during resize	2020-10-14 18:44:22 +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
Dean Herbert	de6fe34361	Bind to local bindable and combine dual bindings	2020-10-11 21:51:48 +09:00
Dean Herbert	5fcdee6fd8	Remove cast and expose as IBindable	2020-10-11 21:46:55 +09:00
unknown	6a52c98a42	make IsBreakTime its own bindable and bind it to BreakTracker on load	2020-10-11 06:15:20 +08:00
unknown	7bbdd6ab25	expose break time bindable	2020-10-10 21:07:17 +08:00
Dean Herbert	8dddd8aff5	Merge pull request #9883 from swoolcock/confine-during-gameplay ... Add "During Gameplay" option for mouse confining	2020-10-08 20:25:27 +09:00
Dean Herbert	dbdb25ccf7	Move reset logic to OsuGame	2020-10-08 18:29:19 +09:00
Dean Herbert	43a575484a	Remove pointless comments	2020-10-08 18:29:09 +09:00
Dean Herbert	0f6eb9d4cb	Ensure music playback is stopped when retrying by any means	2020-10-07 17:40:54 +09:00
Shane Woolcock	2e0a9f53c1	Add test coverage	2020-10-07 17:52:39 +10:30
Shane Woolcock	8b8eb00bd7	Permit nulls rather than casting to OsuGame	2020-10-07 16:16:58 +10:30
Shane Woolcock	485bd962c7	Also reset LocalUserPlaying in OnSuspending	2020-10-07 16:15:17 +10:30
Shane Woolcock	7fff762dfc	Rename IsGameplay	2020-10-07 16:14:49 +10:30
Shane Woolcock	8847b88e65	Fix unit tests trying to resolve OsuGame	2020-10-07 11:44:41 +10:30
Shane Woolcock	ec12a21088	Merge branch 'master' into confine-during-gameplay ... # Conflicts: # osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs	2020-10-07 11:07:00 +10:30
Shane Woolcock	478f2dec96	Maintain the current gameplay state in OsuGame	2020-10-06 22:39:35 +10:30
Shane Woolcock	782fc1d60f	Use OsuGame.OverlayActivationMode rather than per-Player	2020-10-06 20:27:35 +10:30
Dean Herbert	d5782c95bd	Merge branch 'master' into confine-during-gameplay	2020-10-06 18:05:15 +09:00
Dean Herbert	9d7880afda	Make SettingsItem conform to IHasCurrentValue	2020-10-06 17:18:54 +09:00
Dean Herbert	e4710f82ec	Fix sample disabled status not being updated correctly from seek state	2020-10-05 14:27:51 +09:00
Shane Woolcock	a483dfd2d7	Allow confineMouseTracker to be null	2020-10-05 11:54:39 +10:30
Shane Woolcock	5859755886	Use current OverlayActivationMode to determine confine logic	2020-10-05 11:11:46 +10:30
Shane Woolcock	4b6f893408	Merge branch 'master' into confine-during-gameplay ... # Conflicts: # osu.Game/Configuration/OsuConfigManager.cs # osu.Game/OsuGame.cs # osu.Game/Screens/Play/Player.cs	2020-10-05 10:23:37 +10:30
Bartłomiej Dach	6f2b991b32	Ensure true gameplay rate is finite when paused externally	2020-10-04 14:54:51 +02:00
Bartłomiej Dach	1f0620ffd4	Replace assignment references to HitResult.Miss with Judgement.MinResult	2020-10-02 23:31:24 +02:00
Bartłomiej Dach	2b1ef16f89	Replace comparison references to HitResult.Miss with IsHit	2020-10-02 23:31:24 +02:00
Dean Herbert	367b35bb10	Merge branch 'master' into fix-storyboard-sample-pausing	2020-09-30 22:42:26 +09:00
Dean Herbert	b0f8e11bd4	Fix incorrect caching	2020-09-30 17:34:14 +09:00
Dean Herbert	7f579850dd	Merge branch 'master' into fix-editor-silence-on-seek	2020-09-30 17:03:23 +09:00
Dean Herbert	414c40d298	Reverse inheritance order of SkinnableSound's pause logic	2020-09-30 15:45:14 +09:00
Dean Herbert	136843c8e4	Make DrawableStoryboardSample a SkinnableSound ... Allows sharing pause logic with gameplay samples.	2020-09-29 14:25:39 +09:00
Dean Herbert	74e74e1c31	Fix pause loop sound not working because paused	2020-09-29 14:20:41 +09:00
Dean Herbert	c5f6b77bba	Add missing cached type	2020-09-29 13:42:17 +09:00
Dean Herbert	d6f3beffb6	Use existing bindable flow instead	2020-09-29 12:50:17 +09:00
Dean Herbert	4f0c0ea5f9	Fix hit samples playing while paused / seeking in the editor	2020-09-28 18:17:47 +09:00
Dean Herbert	26ba7d3100	Remove unused method (was moved to a more local location)	2020-09-25 13:20:19 +09:00
Dean Herbert	7df8b5bce7	Merge branch 'master' into fix-spinner-rpm-user-rate-adjust	2020-09-25 13:17:03 +09:00
Joehu	c5b684bd2e	Fix typo in log when beatmap fails to load	2020-09-23 00:30:20 -07:00
Dean Herbert	3276b9ae9c	Fix fail animation breaking on post-fail judgements	2020-09-22 15:08:53 +09:00
Dean Herbert	508278505f	Make local clock private	2020-09-21 19:40:57 +09:00
Dean Herbert	3f788da06d	Fix SPM changing incorrectly with playback rate changes	2020-09-21 19:39:54 +09:00
smoogipoo	06c49070b1	Remove player collection settings	2020-09-11 16:04:09 +09:00
Dean Herbert	d3957e6155	Move title specification for settings groups to constructor ... Using an abstract property was awkward for this as it is being consumed in the underlying constructor but could not be dynamically set in time from a derived class.	2020-09-09 18:50:31 +09:00
Lucas A	82e314da59	Fix merge conflicts.	2020-09-03 21:56:47 +02:00
Dan Balasescu	84b3604192	Merge branch 'master' into game-overlay-activation-mode	2020-09-03 13:34:22 +09:00
smoogipoo	7e1844ed77	Fix track adjusments being reset incorrectly	2020-09-01 18:07:19 +09:00
smoogipoo	26b4226b55	Fix ModTimeRamp not working	2020-09-01 16:55:10 +09:00
Dan Balasescu	f08e7828da	Merge branch 'master' into beatmap-track-rework	2020-09-01 16:06:38 +09:00
Lucas A	dd093f44d8	Cast base immutable bindable to mutable for testing purposes and make InitialOverlayActivationMode property protected	2020-08-31 11:26:55 +02:00
Dean Herbert	a171d0e292	Remove unused methods and classes	2020-08-31 18:14:22 +09:00
Dean Herbert	3b03116179	Remove unnecessary using statement	2020-08-21 16:45:59 +09:00
Dean Herbert	f7e4feee34	Update remaining Player components to use WorkingBeatmap again	2020-08-21 15:25:57 +09:00
Dean Herbert	357fb3a10e	Merge branch 'master' into beatmap-track-rework	2020-08-21 12:53:09 +09:00
Dean Herbert	5714c761eb	Merge pull request #9768 from frenzibyte/allow-counter-customize-sprite-text ... Allow providing custom sprite text for RollingCounter<T>	2020-08-20 00:14:48 +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	93a8bc3d5a	Remove local reset method in GameplayClockContainer	2020-08-17 22:36:09 +09:00
Dean Herbert	d9debef156	Add explicit LoadTrack method	2020-08-17 15:38:16 +09:00
Lucas A	589d4eeb52	Remove setting.	2020-08-16 17:18:40 +02:00
Shane Woolcock	85b3fff9c8	Update mouse confine when gameplay state changes	2020-08-16 23:11:09 +09:30
Dean Herbert	71f4e753f0	Merge branch 'master' into beatmap-track-rework	2020-08-16 22:35:32 +09:00
Bartłomiej Dach	a426ff1d5b	Refactor gameplay menu overlay to fix regression	2020-08-15 14:18:50 +02:00
Dean Herbert	e465afa280	Merge branch 'master' into beatmap-track-rework	2020-08-14 20:02:43 +09:00
Dan Balasescu	b7ae70ff96	Merge branch 'master' into fix-skinnable-sound-mute	2020-08-14 19:01:32 +09:00
Lucas A	84cb36b6a8	Defer subscriptions for updateOverlayActivationMode() to OnEntering()	2020-08-13 10:57:18 +02:00
Dean Herbert	99bea6b8e9	Add missing null check (player construction is potentially delayed now)	2020-08-13 12:52:35 +09:00
Dean Herbert	27cd9e119a	Delay beatmap load until after transition has finished ... Previously the beatmap would begin loading at the same time the `PlayerLoader` class was. This can cause a horribly visible series of stutters, especially when a storyboard is involved. Obviously we should be aiming to reduce the stutters via changes to the beatmap load process (such as incremental storyboard loading, `DrawableHitObject` pooling, etc.) but this improves user experience tenfold in the mean time.	2020-08-13 12:04:32 +09:00
smoogipoo	c0031955c9	Update with further framework changes	2020-08-12 01:50:18 +09:00
smoogipoo	e47a1eb313	Use adjustable ITrack	2020-08-12 01:41:21 +09:00
smoogipoo	eec94e1f53	Make track not-null in GameplayClockContainer/FailAnimation	2020-08-12 00:51:43 +09:00
smoogipoo	c66a14e9c5	Remove beatmap from FailAnimation	2020-08-11 12:37:48 +09:00
Lucas A	f74e162bbc	Fix overlay activation mode being updated when player is not current screen.	2020-08-10 20:27:42 +02:00
Lucas A	052bb06c91	Add ability to open overlays during gameplay breaks.	2020-08-10 20:13:50 +02:00
Dean Herbert	365aae799e	Merge branch 'master' into fix-skinnable-sound-mute	2020-08-10 23:55:51 +09:00
Bartłomiej Dach	9a09f97478	Extract constant to avoid double initial value spec	2020-08-08 21:21:30 +02:00
Dean Herbert	e3105fd4c8	Add more resilient logic for whether to avoid playing SkinnableSound on no volume	2020-08-06 19:16:26 +09:00
smoogipoo	2e3ecf71c7	Pass track from Player to components	2020-08-06 18:31:08 +09:00
smoogipoo	5c05fe3988	Expose track from MusicController	2020-08-06 16:24:14 +09:00
smoogipoo	6e42b8219c	Move track to MusicController, compiles	2020-08-06 16:24:14 +09:00
smoogipoo	9a00ad48c6	Update components to use extension methods	2020-08-06 14:43:39 +09:00
Lucas A	71895964f4	Refactor overlay activation logic and reword tip.	2020-08-05 11:21:09 +02:00
Lucas A	30c7a6f6a7	Fix CI issue and use method instead of triggering change on bindable.	2020-08-03 21:33:18 +02:00
Lucas A	242a035f7e	Apply review suggestions.	2020-08-03 21:25:45 +02:00
Lucas A	25ebb8619d	Add tests.	2020-08-03 16:04:11 +02:00
Lucas A	fe97d472df	Enable back overlays when a replay is loaded.	2020-08-02 21:53:13 +02:00
Lucas A	f1ba576438	Disable overlay activation when in gameplay.	2020-08-02 21:34:35 +02:00
Joe Yuan	e795b1ea31	Failing effect displays vertically	2020-07-28 00:42:48 -07:00
Dean Herbert	ee05d5cb14	Remove no-longer-necessary play trigger on skin change	2020-07-23 09:06:15 +09:00