11204 Commits

Author	SHA1	Message	Date
Dean Herbert	c97116c91a	Add safety against DrawableHitObject implementations clearing children	2019-03-25 13:34:22 +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	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
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	9bf48863b0	Fix DrawableRuleset drawable creation method's name	2019-03-25 00:00:29 +09:00
David Zhao	5169f7a43c	Change default for null screen parallax, apply reviews	2019-03-24 16:21:43 +09:00
Dean Herbert	11b474e194	Handle released for safety	2019-03-24 12:19:09 +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
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
Dan Balasescu	b4954c5a7f	Merge branch 'master' into pause-logic-simplification	2019-03-22 15:11:34 +09:00
Dan Balasescu	e09c107f38	Merge branch 'master' into better-dummy-api	2019-03-22 14:51:11 +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
Dan Balasescu	a9975e845c	Merge branch 'master' into upgrade-nuget-packages	2019-03-22 14:37:58 +09:00
Dean Herbert	59d0996c8d	Cleanup other instance of same function	2019-03-22 14:31:54 +09:00
smoogipoo	860999ad29	Cleanup	2019-03-22 14:20:53 +09:00
Dan Balasescu	5de99f3f5b	Merge branch 'master' into fix-random-select-crash	2019-03-22 14:11:06 +09:00
David Zhao	dcae86e39a	Add a new test for OsuScreenStack, fix parallax	2019-03-22 14:10:38 +09:00
Dean Herbert	dc004910d7	Fix AccountCreationOverlay tests and better complete dummy api's behaviour	2019-03-22 11:55:35 +09:00
jorolf	7873022a8b	Merge branch 'master' of git://github.com/ppy/osu into screen-title-class	2019-03-21 22:18:59 +01:00
jorolf	454c82c49e	Don't go outside of the container bounds	2019-03-21 22:18:45 +01:00
Joseph Madamba	d5272a83cf	Rename "urgent" to "topMost"	2019-03-21 11:16:10 -07: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	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	c555019692	Update framework	2019-03-20 22:50:50 +09:00
Dean Herbert	67a65b80fc	Merge branch 'master' into visual-settings-container	2019-03-20 20:48:30 +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	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
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
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
Dean Herbert	5f288650bf	Fix misses/typos	2019-03-20 14:49:33 +09:00
David Zhao	9964644683	Fix merge	2019-03-20 14:37:32 +09:00
Dan Balasescu	aca99c2c42	Merge branch 'master' into player-test-flexibility	2019-03-20 14:31:33 +09:00
David Zhao	2646126d86	Merge remote-tracking branch 'upstream/master' into visual-settings-container	2019-03-20 14:29:20 +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
smoogipoo	6511234804	Fix catch spinners not being allowed for conversion	2019-03-20 13:53:22 +09:00
Joehu	1f95abf7c7	Fix regressions caused by removing specified depths ... - urgentOverlayContent is added so toolbar can be loaded first	2019-03-19 21:30:24 -07:00
Joehu	a39648edbc	Normalize format of single line curly brackets	2019-03-19 20:51:43 -07:00
Joehu	44e0291737	Remove specified depths of overlays	2019-03-19 20:47:12 -07:00
Dean Herbert	936c3e1ed9	Add safety type check to DrawableScrollingRuleset	2019-03-20 11:34:06 +09:00
Dean Herbert	45b8bfcfd3	Better protect not-generic DrawableRuleset	2019-03-20 11:31:03 +09:00
Dean Herbert	7b6d882ce6	Remove double-generic type	2019-03-20 11:29:16 +09:00
Dan Balasescu	e5db0c973e	Merge branch 'master' into fix-background-loading	2019-03-20 11:25:23 +09:00
Dean Herbert	3b7a76aa4e	Fix typo	2019-03-20 11:22:34 +09:00
Dean Herbert	e59917ed03	Merge remote-tracking branch 'upstream/master' into correct-preview-loop	2019-03-20 10:58:15 +09:00
Dean Herbert	7b65d3437f	Merge branch 'master' into fix-background-loading	2019-03-20 10:33:53 +09:00
Dean Herbert	5b6ac7abdc	Merge remote-tracking branch 'upstream/master' into pause-logic-simplification	2019-03-20 10:31:42 +09:00
Dean Herbert	461a0a5038	Merge branch 'master' into remove-unnecessary-code	2019-03-20 10:22:24 +09:00
Dean Herbert	e0ab40b082	Rename missed files	2019-03-19 23:56:12 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	9ca6699c64	Merge remote-tracking branch 'upstream/master' into player-test-flexibility	2019-03-19 20:33:39 +09:00
Dean Herbert	68f28326a2	Refactor RulesetContainer for readability	2019-03-19 20:21:31 +09:00
David Zhao	a1000524ee	Merge branch 'master' into visual-settings-container	2019-03-19 20:17:12 +09:00
David Zhao	a8e2072286	Make blurtarget private, improve documentation	2019-03-19 20:15:28 +09:00
Dean Herbert	def15645f7	Update framework	2019-03-19 17:32:36 +09:00
Dean Herbert	025a266112	Update framework	2019-03-19 17:02:03 +09:00
Dean Herbert	e36ad3eb6b	Add initial alpha in case	2019-03-19 16:11:22 +09:00
Dean Herbert	d2007cfb38	Fix weird transition	2019-03-19 16:10:28 +09:00
Dean Herbert	83f3d3abde	Merge remote-tracking branch 'upstream/master' into disclaimer-support-text	2019-03-19 16:02:34 +09:00
Dean Herbert	3327e2841a	Merge branch 'master' into fix-background-loading	2019-03-19 16:00:09 +09:00
David Zhao	dc26e90a8d	Remove unused usings	2019-03-19 13:16:06 +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	4390e163fc	Merge branch 'master' into storyboard-clock	2019-03-18 21:11:41 +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
Dean Herbert	15dd132c92	Use SetUpSteps attribute	2019-03-18 20:32:36 +09:00
Dean Herbert	a81461ba12	Add ability to test without nofail enabled	2019-03-18 20:32:28 +09:00
David Zhao	acc133896b	Correct null check	2019-03-18 18:19:59 +09:00
Dean Herbert	8df47bc23e	Increase flexibility of player test cases	2019-03-18 17:09:48 +09:00
David Zhao	05147768d3	Permit nulls	2019-03-18 15:50:34 +09:00
David Zhao	6a26972284	DI gameplay clock for Storyboards	2019-03-18 15:25:54 +09:00
Dean Herbert	14df9f94e2	Merge branch 'master' into fix-background-loading	2019-03-18 14:59:35 +09:00
David Zhao	0024a0bdb2	Remove unused using	2019-03-18 14:35:03 +09:00
David Zhao	eac7672c6b	Clean up debug logging	2019-03-18 14:03:54 +09:00
Dean Herbert	392a0a1d74	Merge branch 'master' into update-framework	2019-03-18 11:34:59 +09:00
Dan Balasescu	e0b3149e32	Merge branch 'master' into api-testability	2019-03-18 10:59:06 +09:00
Dean Herbert	9ca4d9d4d1	Remove regions	2019-03-18 10:48:44 +09:00
Dean Herbert	300cb70859	Merge branch 'master' into multi-background-stack	2019-03-18 09:54:27 +09:00
Dean Herbert	c496f6e56b	Fix usages of OnLoadComplete	2019-03-17 13:44:20 +09:00
Dean Herbert	771d676ba1	Split RulesetInputManager out to FrameStabilityContainer	2019-03-17 13:30:52 +09:00
Dean Herbert	8c6caf0b18	Update framework	2019-03-16 01:38:42 +09:00
Dean Herbert	14af957599	Merge pull request #4468 from smoogipoo/fix-min-tick-distance ... Fix ticks not being generated at the minimum tick distance	2019-03-15 12:12:48 +09:00
Dean Herbert	36e5c09710	Merge pull request #4433 from nekodex/prevent-null-lookup ... Don't perform lookup of beatmap stats unless an online id is present	2019-03-15 10:39:39 +09:00
Joehu	e31680e373	Address styling issues on CodeFactor	2019-03-14 16:05:54 -07:00
Dan Balasescu	2c80f73a88	Merge branch 'master' into increase-osu-file-validation	2019-03-14 18:47:32 +09:00
David Zhao	8fc90bb9a0	Remove unused usings	2019-03-14 16:26:34 +09:00
David Zhao	8cdfb1fd61	Remove BlurrableBackgroundScreen, rework tests	2019-03-14 16:09:17 +09:00
smoogipoo	71d79f0a39	Fix ticks not being generated at the minimum tick distance	2019-03-14 15:20:12 +09:00
smoogipoo	2815c3b07c	Remove unused variable	2019-03-14 15:12:26 +09:00
David Zhao	8714902349	Handle all blurring directly from background	2019-03-14 14:02:46 +09:00
Jamie Taylor	69eb4ef983	Change updateMetrics parameter to be optional	2019-03-14 13:35:49 +09:00
Dean Herbert	0042cc5337	Merge branch 'master' into mod-ramp-hotfix	2019-03-14 13:02:29 +09:00
Dean Herbert	7d56ce63d3	Fix test case failures	2019-03-14 12:31:17 +09:00
Dean Herbert	85c518f146	Change logic to better handle external adjustments	2019-03-14 12:29:16 +09:00
Dean Herbert	843ede2d52	Update framework	2019-03-14 11:29:46 +09:00
Dean Herbert	108dcd0a92	Update framework	2019-03-13 21:58:50 +09:00
Dean Herbert	c40e24739b	Fix weird application logic	2019-03-13 21:37:33 +09:00
Dan Balasescu	5d23a966d7	Fix incorrect application logic for rate fallback ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-13 20:55:33 +09:00
Dean Herbert	dd6fbccb56	Slight refactoring of order for readability	2019-03-13 19:57:45 +09:00
Dean Herbert	7fc8e07f12	Merge branch 'master' into prevent-null-lookup	2019-03-13 19:40:44 +09:00
Dean Herbert	7d637691d7	Use non-guest user ID for non-guest user	2019-03-13 19:01:42 +09:00
Dan Balasescu	6aa3dc9f55	Use non-real domain ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-13 18:56:48 +09:00
Dean Herbert	3d4a80957f	Improve comment	2019-03-13 18:27:54 +09:00
David Zhao	de6d8fc637	Move user blurring into VIsualSettingsContainer	2019-03-13 18:25:22 +09:00
Dean Herbert	1617e2a729	Merge branch 'master' into mania-judgemetns	2019-03-13 18:17:42 +09:00
Dean Herbert	8f00f2290a	Log issues	2019-03-13 14:56:41 +09:00
Dean Herbert	241e336c21	Fix break parsing	2019-03-13 14:22:16 +09:00
Jamie Taylor	7a2af5634c	Merge remote-tracking branch 'upstream/master' into prevent-null-lookup	2019-03-13 14:13:50 +09:00
Jamie Taylor	e6449db8e3	Null metrics on null beatmap for transition animation	2019-03-13 14:13:42 +09:00