695 Commits

Author	SHA1	Message	Date
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
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