17485 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Dean Herbert	5f288650bf	Fix misses/typos	2019-03-20 14:49:33 +09:00
Dan Balasescu	268d3c6291	Merge pull request #4485 from peppy/player-test-flexibility ... Increase flexibility of player test cases	2019-03-20 14:39:46 +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
Dean Herbert	ddbc46b5a6	Merge pull request #4493 from smoogipoo/catch-hr-fixes ... Further fixes to catch HR application	2019-03-20 12:58:58 +09:00
smoogipoo	8f0440d14c	Ensure RNG max value cannot go below min value	2019-03-20 12:06:37 +09:00
smoogipoo	003e36862f	Fix JuiceStreams not affecting lastPosition/lastStartTime	2019-03-20 12:06:14 +09:00
Dan Balasescu	033f03d597	Merge pull request #4455 from peppy/fix-background-loading ... Fix screen background performance	2019-03-20 11:35:00 +09: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	3cc1e822af	Merge pull request #4460 from smoogipoo/remove-unnecessary-code ... Remove unnecessary early return for maching beatmap IDs Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-03-20 10:43:54 +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
David Zhao	3af3baf5e6	Fix merge	2019-03-19 20:22:21 +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	46720d7d26	Merge pull request #4490 from peppy/update-framework ... Update framework	2019-03-19 17:55:51 +09:00
Dean Herbert	8f5e02cbe5	Fix a couple of missed cases	2019-03-19 17:41:22 +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