1015 Commits

Author	SHA1	Message	Date
Christine Chen	81be562379	Read StoryboardEndTime directly from Beatmap	2021-04-17 12:28:31 -04:00
smoogipoo	5e82f40d67	Merge branch 'master' into gcc-abstraction	2021-04-16 20:14:53 +09:00
Christine Chen	33a665224e	Clean up skipOutroOverlay if skipping is disabled	2021-04-16 01:03:15 -04:00
Christine Chen	b15838b220	Move storyboard outro logic to DrawableStoryboard	2021-04-16 00:59:10 -04:00
Christine Chen	45c2b72a25	Merge branch 'master' into play-storyboard-outro	2021-04-15 15:11:35 -04:00
Christine Chen	25b8c2f257	Allow skipping storyboard outro ... Reuses SkipOverlay by calculating the endtime of the storyboard and using that as a "start point". Upon skipping the outro the score is instantly shown. When the end of the storyboard is reached the score screen automatically shows up. If the player holds ESC (pause) during the outro, the score is displayed The storyboard endtime is calculated by getting the latest endtime of the storyboard's elements, or simply returning 0 if there is no storyboard. Co-Authored-By: Marlina José <marlina@umich.edu>	2021-04-15 13:20:40 -04:00
smoogipoo	1aa36818df	Abstractify GameplayClockContainer	2021-04-14 17:47:11 +09:00
Salman Ahmed	36510309d1	Merge EnableUserDim and IgnoreUserSettings to one bindable	2021-04-13 10:58:56 +03:00
Dean Herbert	571124669d	Remove all references to "score submission" from Player	2021-03-23 18:20:55 +09:00
Dean Herbert	6cb14e91c9	Make Player abstract and introduce SoloPlayer	2021-03-23 18:18:49 +09:00
Dean Herbert	b1cd01ceb8	Apply ConfigureAwait changes to game side	2021-03-08 14:36:35 +09:00
Dean Herbert	6a5c6febc5	Add inline comment explaining the retry loop	2021-02-23 13:23:32 +09:00
Salman Ahmed	5493c55da7	Fix silly mistake	2021-02-22 16:59:35 +03:00
Salman Ahmed	5e9040c291	Use "pausing supported" conditional instead	2021-02-22 16:26:35 +03:00
Salman Ahmed	6bac83964a	Merge branch 'master' into fix-pofl-on-cooldown	2021-02-22 10:03:27 +03:00
Dean Herbert	38a2124921	Support instant exit if pausing is not allowed in the current game mode	2021-02-20 14:26:50 +09:00
Salman Ahmed	0771154dd2	Make PauseCooldownActive protected and expose on test class	2021-02-19 11:42:30 +03:00
Salman Ahmed	ddd1dcff88	Attempt pausing every single frame	2021-02-19 11:33:26 +03:00
Dean Herbert	82cc06ca57	Fix new logic not considering fail overlay correctly	2021-02-19 17:26:54 +09:00
Dean Herbert	4c214b74ce	Merge branch 'master' into fix-error-exit-during-results-transition	2021-02-19 17:13:55 +09:00
Salman Ahmed	4436585aa4	Keep attempting to pause gameplay while window not active	2021-02-19 10:46:32 +03:00
Salman Ahmed	772471a6d8	Add failing test case	2021-02-19 10:46:31 +03:00
Dean Herbert	9cba350337	Refactor again to better cover cases where the pause dialog should definitely be shown	2021-02-15 15:57:36 +09:00
Dean Herbert	1aea840504	Add missing return in early exit scenario (MakeCurrent isn't compatible with the following Exit)	2021-02-15 15:03:12 +09:00
Dean Herbert	2b69c7b325	Fix incorrect order of operation in pause blocking logic	2021-02-15 14:24:08 +09:00
smoogipoo	d3f0c0730d	Merge branch 'master' into non-concurrent-sample-playback	2021-02-12 17:22:15 +09:00
Dean Herbert	2c052d70e8	Only trigger pause cooldown on pause (not exit)	2021-02-09 17:29:18 +09:00
Dean Herbert	cba116ff09	Fix incorrect call parameter for quick exit	2021-02-09 17:28:57 +09:00
Dean Herbert	61b9539864	Fix regression in quick exit logic	2021-02-09 17:14:16 +09:00
Dean Herbert	5bd4f74ddf	Fix a potential crash when exiting play during the results screen transition	2021-02-09 16:24:29 +09:00
Dean Herbert	156f5bd5df	Add newline between statements	2021-02-08 20:05:16 +09:00
smoogipoo	19368f87fb	Fix failing test	2021-02-08 19:59:07 +09:00
Dean Herbert	9e0724b138	Remove unnecessary double resolution of OsuGame	2021-02-08 15:58:41 +09:00
Salman Ahmed	d0ca2b99a8	Remove unnecessary injected dependency	2021-02-06 20:57:01 +03:00
Salman Ahmed	40ddccf0c7	Do not consider replays for "pause on focus lost" ... Replays are not pausable as can be seen in the `canPause` check.	2021-02-06 20:56:08 +03:00
Salman Ahmed	f29938e15d	Make last binding game activity more sensible	2021-02-05 20:39:57 +03:00
Salman Ahmed	e1789c29b1	Use Pause() instead of performUserRequestedExit() to avoid unexpected operations	2021-02-05 10:28:13 +03:00
Salman Ahmed	730e66f0ee	Make pausing on window focus lose instant	2021-02-05 09:07:59 +03:00
Mysfit	b220939650	Fix storyboard samples continuing to play when the beatmap is paused or the intro is skipped.	2021-01-21 17:10:11 -05:00
smoogipoo	de9d075f94	Initial sample + samplechannel rework	2021-01-19 17:11:40 +09:00
Dean Herbert	b3f08b29ca	Ensure that all changes to screen backgrounds are on the correct thread	2021-01-05 15:22:50 +09:00
Bartłomiej Dach	d5fc517fab	Merge branch 'master' into disallow-skipping	2020-12-24 12:35:22 +01:00
Bartłomiej Dach	ee5a6ff9fa	Merge branch 'master' into improved-loading-experience	2020-12-24 11:59:46 +01:00
Dean Herbert	6bd6888a93	Disallow skipping in multiplayer for now	2020-12-24 16:29:51 +09:00
Dean Herbert	e86e9bfae6	Don't begin gameplay until all users are in a completely prepared state	2020-12-24 15:32:55 +09:00
Dean Herbert	76935b93b6	Merge branch 'master' into disallow-multiplayer-restart-retry	2020-12-24 13:31:54 +09:00
Bartłomiej Dach	980e85ce25	Refactor player exit logic to convey intention better	2020-12-23 16:16:24 +01:00
Dean Herbert	f9fd909187	Fix missed inspections	2020-12-23 18:07:38 +09:00
Dean Herbert	3c8f871b28	Move player constructor configuration to dedicated class; add AllowRestart parameter	2020-12-23 17:47:46 +09:00
Dean Herbert	f5d27b40a8	Standardise flow for aborting realtime player exit to avoid double-exit call	2020-12-23 16:35:39 +09:00
Dean Herbert	beaced3211	Remove unnecessary async state machine	2020-12-19 13:58:56 +09:00
smoogipoo	772dd0287e	Split submission and import into two methods	2020-12-19 03:32:05 +09:00
smoogipoo	eccfc8ccd2	Fix potential cross-reference access	2020-12-18 18:31:49 +09:00
smoogipoo	8826d01559	Create completion progress delegate immediately	2020-12-18 18:20:36 +09:00
smoogipoo	1369b75a86	Fix potential multiple submission	2020-12-18 17:48:42 +09:00
smoogipoo	2958cab239	Remove GotoRanking	2020-12-18 17:47:33 +09:00
smoogipoo	2db7433c0b	Refactor player score creation and submission process	2020-12-18 16:51:59 +09:00
smoogipoo	c80ecec0b4	Reorder methods	2020-12-18 15:36:24 +09:00
Dean Herbert	3ff70d331a	Mark recordingScore as nullable	2020-12-17 16:17:13 +09:00
Dean Herbert	81b0db0401	Remove double construction of empty replay object	2020-12-17 16:17:08 +09:00
Dean Herbert	ae22f75406	Bind replay recording score to judgement changes	2020-12-14 17:33:33 +09:00
Dean Herbert	1793385e96	Pass a score to the replay recorder to allow reading more general scoring data	2020-12-14 16:52:14 +09:00
Dean Herbert	72b8eef36e	Add ability to pause/resume replay playback	2020-11-24 15:41:56 +09:00
Dean Herbert	2db42f8e67	Remove default allowRetry parameter value from ResultsScreen	2020-11-20 14:35:44 +09:00
Bartłomiej Dach	d55eae55ad	Merge branch 'master' into fix-combo-break-rewind-replay	2020-11-13 21:46:32 +01:00
Dean Herbert	4b5743d993	Fix combo break sound not playing after rewind	2020-11-13 13:38:14 +09:00
smoogipoo	66213f2ed0	Add pooling support to DrawableRuleset + Playfield	2020-11-10 23:56:32 +09:00
Dean Herbert	42b3aa3359	Fix spectating when starting from a point that isn't at the beginning of the beatmap	2020-10-27 18:58:37 +09:00
Dean Herbert	851d45d2eb	Add sane pausing logic	2020-10-27 18:58:37 +09:00
Dean Herbert	9cfb81589e	Use bindable flow instead	2020-10-27 14:10:12 +09:00
Dean Herbert	6853da459d	Move sample pausing logic out of FrameStabilityContainer	2020-10-27 13:54:33 +09:00
Dean Herbert	4fca7675b0	Don't send spectate data when an autoplay mod is active	2020-10-23 14:47:21 +09:00
Dean Herbert	80b1f816c7	Merge branch 'master' into hide-hud-during-break-time	2020-10-20 14:19:04 +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	e3eaba7b2c	Move ISampleDisabler implementation to Player and FrameStabilityContainer	2020-10-14 19:39:48 +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	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
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
Dean Herbert	136843c8e4	Make DrawableStoryboardSample a SkinnableSound ... Allows sharing pause logic with gameplay samples.	2020-09-29 14:25:39 +09:00
Joehu	c5b684bd2e	Fix typo in log when beatmap fails to load	2020-09-23 00:30:20 -07: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
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	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	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
Lucas A	84cb36b6a8	Defer subscriptions for updateOverlayActivationMode() to OnEntering()	2020-08-13 10:57:18 +02: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
Bartłomiej Dach	9a09f97478	Extract constant to avoid double initial value spec	2020-08-08 21:21:30 +02:00
smoogipoo	2e3ecf71c7	Pass track from Player to components	2020-08-06 18:31:08 +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
Dean Herbert	fea6389f69	Hide HUD elements during break time by default	2020-07-22 12:41:06 +09:00
Dean Herbert	a6c6e391ca	Fix player not exiting immediately on Alt-F4	2020-06-23 17:38:30 +09:00
Dean Herbert	add1265d53	Block screen suspend while gameplay is active	2020-06-18 23:48:00 +09:00
Dean Herbert	64550fe87c	Merge branch 'master' into fix-draining-in-between-break-sections	2020-06-02 16:06:08 +09:00
smoogipoo	de0b6ec9f1	Create abstract implementation	2020-05-26 17:00:41 +09:00
smoogipoo	e5de382760	Merge branch 'master' into storyboard-overlay-layer	2020-05-20 15:08:45 +09:00
Bartłomiej Dach	ce4301c5b8	Add overlay layer to player by proxying	2020-05-19 19:47:50 +02:00
smoogipoo	6d70f4b410	Merge branch 'master' into allowgameplayoverlays-hide-skip	2020-05-18 19:54:38 +09:00
Lucas A	4096463d02	Move SkipOverlay internal alpha manipulation to a nested container and adjust visual tests.	2020-05-15 19:43:01 +02:00
Lucas A	7874045b1f	Allow disabling SkipOverlay through AllowGameplayOverlays.	2020-05-12 23:05:56 +02:00
Dean Herbert	de50b725d5	Fix mod failure checks executing actual game logic	2020-05-12 20:08:35 +09:00
Dan Balasescu	6841bd5609	Merge branch 'master' into taiko-scroller	2020-05-11 11:10:55 +09:00
Bartłomiej Dach	ee2ff77b89	Merge branch 'master' into fix-draining-in-between-break-sections	2020-05-10 17:57:44 +02:00
Lucas A	30dd158c33	Rename property to AllowGameplayOverlays and update XMLDoc accordingly.	2020-05-08 09:37:50 +02:00
Lucas A	83be5455d3	Disable the display of HUD through DisplayHud property.	2020-05-07 08:52:36 +02:00
Lucas A	aff74db80d	Publicly expose HUDOverlay in Player.	2020-05-05 10:40:10 +02:00
Dean Herbert	cea6be5e52	Expose as JudgementResult instead of "passing" state	2020-05-03 23:55:44 +09:00
Dean Herbert	ff1d63060d	Add and consume passing state in GameplayBeatmap	2020-05-01 20:08:18 +09:00
Dean Herbert	a91c63819b	Refactor updateCompletionState implementation for legibility and code share	2020-04-21 11:55:28 +09:00
Salman Ahmed	e12e3391fb	Base wait steps duration on the delay used for results display ... With `* 2` for safety of not potentially going to the next step and the delegate not executed yet.	2020-04-20 06:42:33 +03:00
Salman Ahmed	6d276890a7	Fix results screen pushed after rewinding in-between push delay	2020-04-19 05:59:56 +03:00
Salman Ahmed	7e64bec94f	Use HasCompleted in Player	2020-04-19 05:58:22 +03:00
Salman Ahmed	7fab07670e	Remove no longer necessary usage of IsBreakTime	2020-04-05 21:35:09 +03:00
smoogipoo	1f797207f7	Rework lookups to not require total playfield columns	2020-04-03 12:31:05 +09:00
Dean Herbert	4f5557096c	Fix auto mod results not displaying correctly	2020-03-29 22:51:28 +09:00
Bartłomiej Dach	3a3bfe9a5e	Reorder children to fix pause overlay z-order	2020-03-27 21:19:49 +01:00
Bartłomiej Dach	adc759771f	Hook up score processor in player	2020-03-27 19:47:42 +01:00
Dan Balasescu	5e1cb0e9e9	Merge branch 'master' into fix-minia-mod-replay-recording	2020-03-27 19:26:41 +09:00
Dean Herbert	f75c082601	Fix osu!mania replays recording incorrectly when key mod applied	2020-03-27 15:50:11 +09:00
Dean Herbert	07462120e4	Split break tracking into its own component	2020-03-26 15:30:23 +09:00
Dean Herbert	d372ddaadd	Move break overlay to a location it is not affected by gameplay scale	2020-03-26 12:50:18 +09:00
Dean Herbert	800e395bc8	Merge branch 'master' into replay-recording	2020-03-25 20:20:59 +09:00
Dean Herbert	a7bfaad60f	More correctly handle rulesets which don't support replay recording	2020-03-24 15:44:39 +09:00
Dean Herbert	022465f546	Add encoding and import support	2020-03-24 14:51:52 +09:00
Dean Herbert	617149fb27	Implement in player	2020-03-23 20:06:18 +09:00
Dean Herbert	729e006c3a	Merge branch 'master' into video-offset	2020-03-21 20:03:46 +09:00
Dean Herbert	855f0a4253	Fix bracket style	2020-03-19 14:38:49 +09:00
Dean Herbert	17c3455b36	Fix potentially invalid push in player while already exiting	2020-03-19 14:10:59 +09:00
smoogipoo	3628814e4e	Merge branch 'fix-score-population' into results-screen	2020-03-17 17:48:39 +09:00
smoogipoo	1c4296f5e7	Implement the new results screen	2020-03-17 17:43:16 +09:00
smoogipoo	daa5e63d0d	Fix replay scores not being populated via player	2020-03-17 16:42:55 +09:00
voidedWarranties	76c832518f	Render video as a part of the storyboard	2020-03-07 21:32:03 -08:00
voidedWarranties	d68d7edea3	Start background video playback based on provided offset	2020-03-07 14:08:13 -08:00
Dean Herbert	a59c3d997d	Refactor implementation to better match what already existed	2020-03-06 18:00:17 +09:00
naoey	3d344a076d	Add test for disabled keycounter, don't discard change event values	2020-03-03 06:17:25 +05:30
naoey	bca58ddb42	Make KeyCounter stop counting during breaks	2020-02-29 21:18:43 +05:30
Dean Herbert	f18a1cde53	Fix crash when reaching results screen on single threaded execution mode	2020-02-29 08:39:27 +09:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
Dean Herbert	884a5fbad4	Fix osu! gameplay cursor not adjusting to mod/convert circle size changes	2020-02-14 14:30:15 +09:00
Salman Ahmed	4cd4055e7c	Rename to AlwaysVisible and add XMLDoc	2020-02-03 20:00:43 +03:00
Salman Ahmed	51ed289c59	Revert namings and behaviour changes	2020-02-03 19:59:58 +03:00
Salman Ahmed	351cb8ac1a	Rename Visible to HasReplayLoaded and change default value ... Doesn't make sense to be true by default	2020-02-03 15:47:52 +03:00
Dean Herbert	b330aec03e	Drain starting at the first hitobject, not gameplay start	2019-12-27 16:16:30 +09:00
Dean Herbert	cac011edc1	Merge branch 'master' into hp-drain	2019-12-26 23:51:12 +09:00
Dean Herbert	033bb15500	Fix early-escape not continuing to results screen (#7362) ... Fix early-escape not continuing to results screen	2019-12-26 23:50:21 +09:00
Dean Herbert	a041f32072	Use cleaner solution via cancellation of older schedule	2019-12-26 19:05:32 +09:00
smoogipoo	8903f286ef	Fix escape not continuing to results screen	2019-12-26 18:27:48 +09:00
smoogipoo	522847987b	Implement break/gameplay start times	2019-12-26 15:00:58 +09:00
smoogipoo	b348abcd07	Only drain health in non-break times	2019-12-26 14:59:49 +09:00
smoogipoo	977fb3d1bf	Make processors and break overlay frame-stable	2019-12-26 14:59:49 +09:00
smoogipoo	a4b1c79e18	Initial implementation of HP drain	2019-12-26 14:59:49 +09:00
smoogipoo	90cb9d9162	Simplify scoreprocesor/healthprocessor implementations	2019-12-26 14:59:49 +09:00
smoogipoo	7414a6aadd	Merge remote-tracking branch 'huoyaoyuan/master' into health-processor ... # Conflicts: # osu.Game.Rulesets.Catch/CatchRuleset.cs # osu.Game.Rulesets.Mania/ManiaRuleset.cs # osu.Game.Rulesets.Taiko/TaikoRuleset.cs	2019-12-26 14:56:54 +09:00
smoogipoo	c7936e40d5	Protect against potential nullref	2019-12-23 19:13:36 +09:00
smoogipoo	76f2fb378f	Separate score and health parts of ScoreProcessor	2019-12-19 20:03:14 +09:00
smoogipoo	49bf8d27d1	Move CreateScoreProcessor() to Ruleset	2019-12-17 20:08:13 +09:00
Dean Herbert	b5db927d93	Merge branch 'master' into cinema-mod	2019-12-17 12:56:06 +09:00
Dean Herbert	7559012fb7	Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks	2019-12-12 19:55:09 +09:00
Dean Herbert	d15f49f60f	Also hide the break overlay	2019-12-12 16:13:02 +09:00
Dean Herbert	37a94988a3	Merge branch 'improve-hud-hiding' into cinema-mod	2019-12-12 16:12:19 +09:00
smoogipoo	5861eca80d	Make DrawableRuleset take a converted beatmap	2019-12-12 15:58:11 +09:00
Dean Herbert	a93d57b77e	Merge branch 'master' into lighten-playfield-during-breaks	2019-12-12 11:57:21 +09:00
Dean Herbert	d2ada90434	Merge branch 'master' into single-scoreprocessor	2019-12-12 11:36:45 +09:00
Albie	4a1c6db3ed	Merge branch 'master' into cinema-mod	2019-12-11 18:00:17 +00:00
smoogipoo	48f1dad4aa	Remove abstract ScoreProcessor class	2019-12-11 17:25:06 +09:00
Dean Herbert	75f9250645	Don't automatically pause when window is inactive if in break time	2019-12-11 15:46:07 +09:00
Salman Ahmed	53daa37eaa	Fix failing tests	2019-12-10 23:06:13 +03:00
Albie	a61f8cc2c3	Merge branch 'master' into cinema-mod	2019-12-10 17:06:53 +00:00
Salman Ahmed	38f1a8bc17	Bind UserDimContainer.IsBreakTime from Player	2019-12-10 15:14:47 +03:00
Albie	7864899249	Merge branch 'master' into cinema-mod	2019-11-28 16:42:01 +00:00
smoogipoo	f504370867	Make player block exit if pausable	2019-11-28 15:58:26 +09:00
Dean Herbert	6b8983b489	Consider intro and outro time as "break" time	2019-11-25 19:02:11 +09:00
Albie	9fdbb2a58e	change name of interface and expose method instead of seperate values	2019-11-25 07:24:29 +00:00
Albie	9a8e3fe1da	add brackets	2019-11-24 07:44:35 +00:00
Albie	1d6665fe57	improve code quality using resharper and codefactor advice	2019-11-24 07:42:39 +00:00
Albie	b8e5796af5	add forced video/storyboard and disabled dim for mod inside new interface	2019-11-24 07:37:06 +00:00
Dean Herbert	46a94821d4	Add support for consecutive skips	2019-11-21 18:59:55 +09:00
Dean Herbert	cd1dd0f898	Fix adjustments not being removed correctly on retry from pause	2019-11-06 10:38:04 +09:00
Dean Herbert	6dde755ef2	Merge branch 'master' into add-retry-button	2019-11-02 21:23:16 +09:00
Dean Herbert	551032803d	Fix GameplayClockContainer operating on beatmap's track after s… (#6688) ... Fix GameplayClockContainer operating on beatmap's track after screen exited	2019-11-02 21:22:13 +09:00
Dan Balasescu	8a5d3ab40a	Merge branch 'master' into add-retry-button	2019-11-02 10:51:14 +09:00
Dean Herbert	daa0ebe2b5	Add xmldoc	2019-11-01 15:51:45 +09:00
Dean Herbert	14453da1d2	Centralise MakeCurrent call	2019-11-01 15:51:10 +09:00
Dean Herbert	84d17f3702	Add retry button	2019-11-01 15:41:51 +09:00
Dean Herbert	dcc8f6e827	Better group cancel conditional	2019-11-01 14:43:52 +09:00
Dean Herbert	ac02bb005d	Fix GameplayClockContainer operating on beatmap's track after scren exited	2019-11-01 14:11:18 +09:00
nwabear	b0e21c2749	Fixed Issue #6442	2019-10-25 14:57:49 -05:00
Dean Herbert	47c1f36f9d	Add ValidForResume check	2019-10-04 11:41:53 +08:00
Dean Herbert	71985c7ef1	Update fail logic to match	2019-10-04 11:23:42 +08:00
Joehu	a69b9f1148	Fix alt-f4 being blocked during gameplay	2019-10-02 11:16:31 -07: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	c76e27549a	Remove spacing	2019-09-19 14:56:52 +09:00
iiSaLMaN	da4d83063e	Simplify LINQ expression	2019-09-19 08:31:11 +03:00
iiSaLMaN	9de0bcae1e	Check for blocking fail mods by default	2019-09-19 07:58:54 +03:00
iiSaLMaN	ecd721e8c5	Add bypass fail property to Player	2019-09-18 22:49:28 +03:00
Dean Herbert	2fcc8c2d72	Simplify implementation, play fail animation during restart	2019-09-19 01:45:59 +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	2381b4c003	Move video behind storyboard	2019-09-16 00:20:56 +09:00
Andrei Zavatski	437e121056	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video	2019-09-13 13:39:58 +03:00
smoogipoo	cf2f841b4d	Fix player not correctly exiting after an unpause	2019-09-13 15:42:58 +09:00
Dean Herbert	7ca51d3866	Fix resume overlay being drawn below cursor ... Closes #5905.	2019-09-02 11:20:55 +09:00
Andrei Zavatski	d4291556ee	Remove unused using	2019-08-31 02:57:14 +03:00
Andrei Zavatski	fd958ec1ab	Remove unused property accessor	2019-08-31 02:56:41 +03:00
Andrei Zavatski	d55be4d59c	Implement DimmableVideo component	2019-08-30 23:48:38 +03:00
Andrei Zavatski	58a0b4e19b	Add basic layout for player	2019-08-30 23:19:55 +03:00
Dean Herbert	7aeeb65ae7	Tidy up Player's container loading logic ... Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).	2019-08-27 18:27:21 +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
iiSaLMaN	c2b3c28c79	Use IsBreakTime for checking if currently in a break ... Rather than iterating over all breaks to find which is in current time	2019-08-07 16:15:53 +03:00
Dean Herbert	dda078277a	Minor variable name changes	2019-08-06 23:05:12 +09:00
iiSaLMaN	2a68bb2749	onCompletionEvent -> pushResults	2019-08-06 14:11:43 +03:00
iiSaLMaN	dd701eaa62	Safely cancel the completion task on restart or immediate exit	2019-08-06 14:10:03 +03:00
Dean Herbert	8b67f88d16	Don't expose dimmable container creation in player	2019-07-12 12:04:45 +09:00
Dean Herbert	46f7bb885b	Move classes to local namespaces ... Also renames test scene to more appropriate name.	2019-07-12 11:50:06 +09:00
David Zhao	321266e96f	Make UserDimContainer abstract	2019-07-11 13:17:28 +09:00
David Zhao	7929104b8a	move default into StoryboardContainer, fix load bug, remove comment	2019-07-10 12:24:05 +09:00
David Zhao	41afe89c0b	delete no longer needed bindable	2019-07-10 00:46:34 +09:00
David Zhao	5bb21ecae0	remove storyboard region	2019-07-09 16:50:37 +09:00
David Zhao	89cb8a0cac	Move storyboard initialization to new StoryboardContainer	2019-07-09 16:23:59 +09:00
David Zhao	0cf4bf2352	Manually set clock for storyboard if loading before being given a parent	2019-07-08 18:46:12 +09:00
Salman Ahmed	744e651a37	Merge branch 'master' into applicable-to-hud	2019-07-02 05:24:56 +03:00
welsar55	d6561531a3	Merge branch 'master' into combobreak	2019-06-29 11:55:10 -05:00
Welsar55	a22c166575	Make ComboEffects its own class	2019-06-29 11:28:40 -05:00
Welsar55	a57218e50e	Move to LocalSkinOverride	2019-06-28 20:45:11 -05:00