720 Commits

Author	SHA1	Message	Date
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
iiSaLMaN	d37cefbad8	Implement IApplicableToHUD	2019-06-29 04:23:59 +03:00
Welsar55	826699a7e7	Remove unneeded bindable	2019-06-26 12:16:44 -05:00
Welsar55	7dd1479050	Add combobreak sound	2019-06-26 00:20:33 -05:00
Dean Herbert	40cf573368	Fix pause not correctly showing pause screen	2019-06-25 23:15:58 +09:00
smoogipoo	8c96e4c1fa	Move back button to OsuGame	2019-06-25 18:33:08 +09:00
Dean Herbert	fad1ced1b5	Add correct conditionals to allow exit	2019-06-24 18:15:27 +09:00
Dean Herbert	021d0273f9	Split out user activity from user status (#4619) ... Split out user activity from user status Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-06-12 20:14:03 +09:00
Dean Herbert	20b43c20c8	Rename variables to remove redundant "screen" terminology	2019-06-12 16:33:15 +09:00
Dean Herbert	a9c229b1ec	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-12 16:00:35 +09:00
Lucas A	15893bbb75	Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.	2019-06-11 19:41:48 +02:00
Dean Herbert	606be3d7ce	Merge branch 'master' into backgrounded-beatmap-status-lookups	2019-06-12 00:22:47 +09:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Lucas A	141775d98c	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-10 21:41:00 +02:00
smoogipoo	f090e292c9	Move ArchiveModelManager import process to async flow	2019-06-10 13:42:22 +09:00
Lucas A	a2bc5b538e	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-05 16:59:38 +02:00
Dean Herbert	9c214c3f0e	Add animation on failing	2019-06-04 16:13:16 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
Lucas A	a819dd764f	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-25 11:02:19 +02:00
Dean Herbert	359e5b71a5	Fix race condition causing player to never restart	2019-05-16 17:13:03 +09:00
Lucas A	55663b3576	Nest all UserActivities into UserActivity	2019-05-12 17:38:02 +02:00
Lucas A	5ac6bd8204	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-12 11:53:30 +02:00
Dean Herbert	038e49701e	Move conditional to within BreakPeriod	2019-05-12 16:25:25 +09:00
Dean Herbert	1391aa342c	Merge branch 'master' into break-pause	2019-05-12 16:15:24 +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
Lucas A	a5f758b977	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-07 18:27:14 +02:00
Lucas A	d5d31282e5	Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes	2019-05-05 20:55:42 +02: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
Lucas A	a4a2ce5ec0	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-02 21:36:28 +02:00
Lucas A	5d4aa5a12e	Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus	2019-05-02 20:51:19 +02:00
Lucas A	7e42068a14	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-04-28 19:48:35 +02:00
iiSaLMaN	b08fb5136e	Merge branch 'master' into sh-xh-grading-2	2019-04-26 10:38:10 +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
Lucas A	fe8c705f1b	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-04-20 09:42:32 +02:00
smoogipoo	5a3d6a0258	Fix post-merge errors	2019-04-17 16:11:59 +09:00
Dean Herbert	bb539af1a0	Merge branch 'master' into player-mod-reinstantiation	2019-04-16 22:35:21 +08:00
Lucas A	5887008fb3	Merge branch 'master' into user-status-wiring	2019-04-15 11:43:53 +02:00
DrabWeb	c766631ad6	Check for breaks using GameplayClock time.	2019-04-13 11:39:22 -03:00
Lucas A	361c0ec9f2	Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in	2019-04-13 13:18:44 +02:00
Lucas A	da5d6cb1d4	Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap	2019-04-12 22:54:35 +02:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
smoogipoo	4c571acd67	Reinstantiate mods for every player	2019-04-09 13:33:16 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
DrabWeb	e76897d6a7	Fix ResumeContainers appearing when resuming during breaks.	2019-04-07 16:32:55 -03:00
Dean Herbert	6949c233bf	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 15:02:12 +09:00
Dean Herbert	a88f23e555	Convert remaining two flags to ctor parameters	2019-03-26 16:53:44 +09:00
Dean Herbert	83863d35c3	Remove AllowLeadIn flag	2019-03-26 16:35:00 +09:00
Dean Herbert	256a579de0	Allow player to not pause on focus loss	2019-03-26 13:17:00 +09:00
Dean Herbert	9e6cdd7bd5	Combine conditionals and clarify comment	2019-03-22 14:42:51 +09:00
Dean Herbert	5b8fd6822e	Move storyboard logic region down	2019-03-22 14:39:20 +09:00
Dean Herbert	15f9a6b9df	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-21 16:04:18 +09:00
Dean Herbert	67a65b80fc	Merge branch 'master' into visual-settings-container	2019-03-20 20:48:30 +09:00
Dean Herbert	01f795b046	Make restart public rather than reimplementing	2019-03-20 19:45:04 +09:00
Dean Herbert	f43e7a880c	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-20 15:27:06 +09:00
David Zhao	15637f9c4a	Rework instant blur logic such that updateVisuals doesn't need to be public	2019-03-20 14:17:35 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
David Zhao	a8e2072286	Make blurtarget private, improve documentation	2019-03-19 20:15:28 +09:00
David Zhao	df37973e84	Move showstoryboard into player	2019-03-19 13:13:19 +09:00
David Zhao	27a92e017c	rename back to UserDimContainer	2019-03-19 13:06:14 +09:00
David Zhao	f1b2073bf6	Merge remote-tracking branch 'upstream/master' into visual-settings-container	2019-03-19 13:01:05 +09:00
Dean Herbert	4f075f4740	Add more comprehensive testing	2019-03-18 20:33:43 +09:00
Dean Herbert	9433a97747	Add resume requesting support and fix exit scenarios	2019-03-18 20:33:43 +09:00
Dean Herbert	536b5e0dab	Remove PausableGameplayContainer	2019-03-18 20:33:43 +09:00
Dean Herbert	f13003c53b	Simplify and localise storyboard logic in Player.cs	2019-03-18 20:33:43 +09:00
Dean Herbert	bcaff9f7b4	Add basic pause tests	2019-03-18 20:33:43 +09:00
Dean Herbert	465c95e952	Refactor pause logic so GameplayClockContainer is in control	2019-03-18 20:33:43 +09:00
David Zhao	de6d8fc637	Move user blurring into VIsualSettingsContainer	2019-03-13 18:25:22 +09:00
Dean Herbert	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09:00
smoogipoo	d055b248ac	Remove blank line	2019-03-08 15:56:36 +09:00
smoogipoo	7c5ca67691	Merge remote-tracking branch 'origin/master' into gameplay-clock-container ... # Conflicts: # osu.Game/Screens/Play/Player.cs	2019-03-08 15:54:15 +09:00
Dean Herbert	ed8c9bc88a	Merge remote-tracking branch 'upstream/master' into gameplay-clock-container	2019-03-08 15:07:55 +09:00
Dean Herbert	64b6eaa844	Simplify inward bindings	2019-03-07 16:04:11 +09:00
Dean Herbert	58ef397f4f	Move all clock related gameplay logic inside GameplayClockContainer	2019-03-07 16:02:24 +09:00
Dean Herbert	ffe53411f6	Add back cursor proxying	2019-03-06 17:44:58 +09:00
Dean Herbert	acf518c208	Move cursor inside playfield	2019-03-06 17:41:54 +09:00
Dean Herbert	5411c63093	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-06 17:14:08 +09:00
Dean Herbert	6b042eae94	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-05 22:22:56 +09:00
Dean Herbert	8a6fa0915e	Merge branch 'master' into simplify-gameplay-clock	2019-03-05 20:22:46 +09:00
Dean Herbert	76ce3954a0	Rename PauseContainer	2019-03-05 19:30:55 +09:00
Dean Herbert	fc0b297232	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-05 18:06:24 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
Dean Herbert	c5cd9972c4	Make restart private	2019-03-05 13:37:51 +09:00
Dean Herbert	01f1018d02	Tidy up clock logic using DI and a GameplayClock	2019-03-05 13:37:51 +09:00
Dean Herbert	30e820d107	Fix storyboard potentially being loaded many times	2019-02-28 20:36:00 +09:00
Dean Herbert	53eb0e7e4e	More formatting fixes	2019-02-28 20:30:23 +09:00
Dean Herbert	6861163226	Remove pointless method	2019-02-28 20:21:27 +09:00
David Zhao	e3338e94d1	Make test cases more compact, add two way toggles	2019-02-28 20:01:15 +09:00
Dan Balasescu	99812bd448	Apply suggestions from code review ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-02-28 18:25:58 +09:00
Dean Herbert	b2872b47d0	Merge branch 'master' into UserDimLogic	2019-02-28 17:18:04 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
David Zhao	882fff1631	Assert storyboard visibilty at both steps of toggle	2019-02-27 17:56:44 +09:00
David Zhao	14ffd9efe8	Add fake storyboard to visually assess storyboard dim	2019-02-27 17:02:04 +09:00
David Zhao	d750023c52	Fix TestCasePlayerLoader not having a background stack	2019-02-25 22:05:49 +09:00