17534 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	4c0121a112	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-26 11:31:23 +09:00
Dean Herbert	b75ea295db	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 11:28:43 +09:00
Dean Herbert	82140c38fc	Apply CI fixes	2019-03-25 22:00:33 +09:00
Dean Herbert	a642f10131	Remove redundant cast	2019-03-25 21:52:01 +09:00
Dean Herbert	15aea7f745	Update framework	2019-03-25 21:50:28 +09:00
Dean Herbert	245f463e3f	Don't update gameplay loop while paused	2019-03-25 20:31:55 +09:00
Dean Herbert	a23dfb58ad	Add base cursor class to retrieve true visibility state	2019-03-25 20:31:55 +09:00
Dean Herbert	06d4856e17	Remove unnecessary CursorTargetContainer	2019-03-25 20:31:55 +09:00
Dean Herbert	9588944048	Fix multiple cursors appearing	2019-03-25 20:31:55 +09:00
Dean Herbert	c79d187a89	Add final osu! resume screen implementation	2019-03-25 20:31:55 +09:00
Dean Herbert	38e481686f	Make PlayfieldAdjustmentContainer universal	2019-03-25 20:31:55 +09:00
Dean Herbert	650a5c993a	Add test	2019-03-25 20:31:55 +09:00
Dean Herbert	57b3b7b54b	Add back resume overlay	2019-03-25 20:31:55 +09:00
Dean Herbert	a694626cc6	Add proper resume request logic	2019-03-25 20:31:55 +09:00
Dean Herbert	8ad4009c33	osu! resume overlay	2019-03-25 20:31:55 +09:00
Dean Herbert	bc16a82494	Move osu! cursor to its own class	2019-03-25 14:19:38 +09:00
Dean Herbert	a63bcff5cc	Merge pull request #4525 from LeNitrous/skinnable-scaling-container-background ... Make the scaling background customisable to current skin background Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-03-25 13:49:52 +09:00
Dean Herbert	5b83e97e9d	Fix typo	2019-03-25 13:38:50 +09:00
Dean Herbert	fcc91efc1a	Merge branch 'master' into skinnable-scaling-container-background	2019-03-25 13:33:39 +09:00
Dean Herbert	cd1b171df7	Refactor async load logic (not required due to stack presence)	2019-03-25 13:28:51 +09:00
Dean Herbert	1155dba195	Merge pull request #4451 from nyquillerium/multi-background-stack ... Centralise BackgroundScreenStack handling Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-03-25 13:12:01 +09:00
Dean Herbert	e705eb586d	Revert unintentional change	2019-03-25 12:51:54 +09:00
Dean Herbert	9a6576c0a1	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-25 12:40:31 +09:00
Dean Herbert	371166955e	Apply a few minor refactors	2019-03-25 12:39:40 +09:00
Dan Balasescu	129a799084	Merge pull request #4522 from peppy/testcase-folders ... Add grouping of visual tests	2019-03-25 11:50:49 +09:00
LeNitrous	fee260fa03	remove empty argument list	2019-03-25 06:05:57 +08:00
LeNitrous	01ce8f161e	make scaling container background use BackgroundScreenStack with BackgroundScreenDefault	2019-03-25 05:49:57 +08:00
Dean Herbert	a1c5eda05b	Add grouping of visual tests	2019-03-25 01:02:36 +09:00
David Zhao	5169f7a43c	Change default for null screen parallax, apply reviews	2019-03-24 16:21:43 +09:00
Nathan Alo	06fd735190	Merge pull request #2 from ppy/master ... merge from upstream-master	2019-03-24 15:02:28 +08:00
Dean Herbert	8c8c761e02	Merge pull request #4169 from Scotsoo/menu-globalaction-select ... Add support for key bindings in gameplay menus Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-03-24 12:29:50 +09:00
Dean Herbert	11b474e194	Handle released for safety	2019-03-24 12:19:09 +09:00
Dean Herbert	1e0027e4f2	Fix test	2019-03-24 12:09:18 +09:00
Dean Herbert	0d72104235	Refactor for formatting sanity	2019-03-24 12:03:06 +09:00
Dean Herbert	8ad19fc2d4	Merge branch 'master' into menu-globalaction-select	2019-03-24 11:58:52 +09:00
Dan Balasescu	ddc0177821	Merge pull request #4513 from peppy/update-framework ... Update framework	2019-03-23 02:40:42 +09:00
Dean Herbert	9a11a08acc	Update textbox usages	2019-03-23 02:00:27 +09:00
Dean Herbert	97675f6495	Update framework	2019-03-23 00:55:31 +09:00
Dean Herbert	db89796752	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-22 16:05:39 +09:00
Dean Herbert	670c25d5e8	Refactor test	2019-03-22 16:03:08 +09:00
Dean Herbert	123dbb2c5c	Merge pull request #4487 from peppy/pause-logic-simplification ... Simplify and centralise pause logic Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-03-22 15:28:16 +09:00
David Zhao	c43b1afa30	Use is loaded instead	2019-03-22 15:23:18 +09:00
David Zhao	8fb4de101f	Wait for screen current	2019-03-22 15:20:06 +09:00
Dan Balasescu	b4954c5a7f	Merge branch 'master' into pause-logic-simplification	2019-03-22 15:11:34 +09:00
Dan Balasescu	9d32b97b81	Merge pull request #4511 from peppy/better-dummy-api ... Fix AccountCreationOverlay tests and better complete dummy api's behaviour	2019-03-22 15:11:29 +09:00
David Zhao	9a466d97ed	Add texts to make test more visually confirmable, add no parallax screen.	2019-03-22 15:08:47 +09:00
Dan Balasescu	e09c107f38	Merge branch 'master' into better-dummy-api	2019-03-22 14:51:11 +09:00
Dan Balasescu	118ddb7ba6	Merge pull request #4508 from peppy/upgrade-nuget-packages ... Bring nuget packages up to date	2019-03-22 14:51:03 +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