17528 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Balasescu	5e909096c3	Merge pull request #4504 from peppy/fix-song-select-bindable-issues ... Fix song select bindable crashes	2019-03-22 14:10:26 +09:00
Dan Balasescu	c383705fe6	Merge branch 'master' into fix-song-select-bindable-issues	2019-03-22 13:57:13 +09:00
Dan Balasescu	4fa6afdb1f	Merge pull request #4497 from peppy/fix-editor-cursor ... Fix gameplay cursor showing in editor	2019-03-22 13:14:07 +09:00
Dan Balasescu	e40f77cbeb	Merge branch 'master' into fix-editor-cursor	2019-03-22 12:36:36 +09:00
Dean Herbert	dc004910d7	Fix AccountCreationOverlay tests and better complete dummy api's behaviour	2019-03-22 11:55:35 +09:00
Dean Herbert	d6f17a5ecd	Bring nuget packages up to date	2019-03-22 02:41:21 +09:00
Dean Herbert	37010f97d7	Fix random select crashing ... Closes #3383.	2019-03-21 21:02:54 +09:00
Dean Herbert	a10e43410a	Fix song select potentially starting play before the carousel (and bindables) have been initialised	2019-03-21 20:52:34 +09:00
Dean Herbert	4789aa81cb	Add an explicit flag for tracking song select's bindable binding ... Not required (this change does not affect logic) but improves clarity.	2019-03-21 20:52:15 +09:00
Dean Herbert	96dba6a20d	Move nested method to bottom of class	2019-03-21 20:51:21 +09:00
Dean Herbert	e2503888a4	Expose carousel's loaded flag	2019-03-21 20:51:06 +09:00
Dean Herbert	aa1dfdd663	Extract logic shared between tests	2019-03-21 16:33:34 +09:00
Dean Herbert	b17c5c0bb3	Add more tests for exitability	2019-03-21 16:12:14 +09:00
Dean Herbert	15f9a6b9df	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-21 16:04:18 +09:00
David Zhao	ee0d7b6c6d	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-21 15:35:14 +09:00
Dean Herbert	6058f994e1	Merge pull request #4500 from peppy/update-framework ... Update framework	2019-03-20 23:59:45 +09:00
Dean Herbert	c555019692	Update framework	2019-03-20 22:50:50 +09:00
Dean Herbert	42cb80e068	Merge pull request #4466 from nyquillerium/visual-settings-container ... Move user blurring logic into UserDimContainer	2019-03-20 22:22:11 +09:00
Dean Herbert	67a65b80fc	Merge branch 'master' into visual-settings-container	2019-03-20 20:48:30 +09:00
Dean Herbert	6a7ab6a001	Do less import work in [SetUp] step	2019-03-20 20:47:25 +09:00
Dean Herbert	298c98871d	Actually add the background	2019-03-20 20:18:08 +09:00
Dean Herbert	ba89bfee0c	Define explicit method to add background ... Also cleans up some redundant/misplaced comments.	2019-03-20 20:16:45 +09:00
Dean Herbert	8865d53992	Reword comment	2019-03-20 20:04:07 +09:00
David Zhao	2e9d823af4	Add comment regarding HandlePositionalInput	2019-03-20 19:59:54 +09:00
David Zhao	2ff7aa6c2e	Remove handle positional input	2019-03-20 19:49:37 +09:00
David Zhao	bc6e8ce7b4	Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container	2019-03-20 19:48:57 +09:00
Dean Herbert	01f795b046	Make restart public rather than reimplementing	2019-03-20 19:45:04 +09:00
David Zhao	8543e8c36f	Put loadcomplete next to other protected overrides	2019-03-20 19:42:39 +09:00
Dean Herbert	cda5bc28c8	Add proper comment	2019-03-20 19:41:20 +09:00
Dean Herbert	18de9e51c5	Formatting and naming improvements	2019-03-20 19:39:03 +09:00
David Zhao	9013afe412	Query for input manager once	2019-03-20 19:35:40 +09:00
Dean Herbert	7254b765b0	Fix gameplay cursor showing in editor	2019-03-20 19:26:24 +09:00
Dean Herbert	acbcca4462	Merge branch 'master' into multi-background-stack	2019-03-20 19:11:27 +09:00
Dean Herbert	fe255c54d0	Merge pull request #4496 from smoogipoo/reinstantiate-mods ... Fix mods being reused for difficulty calculation	2019-03-20 19:10:52 +09:00
Dean Herbert	2118d50bae	Merge pull request #4495 from smoogipoo/fix-spinner-conversion ... Fix catch spinners not being allowed for conversion Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-03-20 19:10:31 +09:00
David Zhao	b5e8eb2a4a	Wait for dim	2019-03-20 17:31:06 +09:00
David Zhao	fbfef844de	Add test case for resuming PlayerLoader	2019-03-20 17:18:42 +09:00
David Zhao	a5916f995e	Use the previous conditional instead	2019-03-20 16:54:42 +09:00
David Zhao	e9034c8a30	Move blurring logic into Update instead	2019-03-20 16:50:47 +09:00
smoogipoo	c510385aa8	Remove unnecessary allocations	2019-03-20 16:46:16 +09:00
smoogipoo	6df275c83a	Use fresh mods for each difficulty calculation iteration	2019-03-20 16:37:25 +09:00
Dean Herbert	13e2d6a340	Merge branch 'master' into fix-spinner-conversion	2019-03-20 16:32:44 +09:00
Dean Herbert	f43e7a880c	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-20 15:27:06 +09:00
Dan Balasescu	8d35b4fece	Merge pull request #4491 from peppy/ruleset-container-refactor ... Refactor RulesetContainer for readability	2019-03-20 15:17:34 +09:00
David Zhao	1086688e0a	Fix variable hiding	2019-03-20 15:13:59 +09:00
David Zhao	f670e4664d	Amend comment	2019-03-20 15:06:07 +09:00
David Zhao	2467ece020	store a field	2019-03-20 14:58:32 +09:00
Dean Herbert	6f1610be79	Merge branch 'master' into ruleset-container-refactor	2019-03-20 14:55:58 +09:00
David Zhao	86658e357b	Override add instead	2019-03-20 14:55:52 +09:00
Dean Herbert	c186629b8a	Reorder class	2019-03-20 14:55:38 +09:00