8207 Commits

Author	SHA1	Message	Date
Dan Balasescu	234ed04cdd	Merge branch 'master' into remove-migrate-exception	2018-06-15 17:22:34 +09:00
Dean Herbert	db9141a6cf	Merge branch 'master' into fix-music-controller-drag	2018-06-15 17:08:01 +09:00
Dan Balasescu	aaf3ef240e	Remove easily-confused comment	2018-06-15 17:07:07 +09:00
Dean Herbert	8b5a9c3236	Merge branch 'master' into fix-volume-pixellation	2018-06-15 16:45:15 +09:00
Dean Herbert	a2950b1d80	Fix incorrect comment	2018-06-15 16:12:18 +09:00
Dean Herbert	1c27ef644a	Fix music controller drag activating from anywhere on the screen	2018-06-15 16:12:11 +09:00
Dean Herbert	036c57833b	Merge branch 'master' into conversion-test-improvements	2018-06-15 14:26:37 +09:00
Joehu	069d939e29	Remove "from" prefix from sources on direct panels	2018-06-14 21:53:01 -07:00
Dan Balasescu	98cafa106f	Merge branch 'master' into fix-volume-pixellation	2018-06-15 13:44:18 +09:00
Dean Herbert	4a19f22b3d	Remove custom migration exception ... This was hiding the true error message from ever hitting logs. Made to help disagnose #2711.	2018-06-15 13:38:42 +09:00
smoogipoo	a4d2364083	Add one more newline	2018-06-14 21:29:08 +09:00
smoogipoo	b99b520656	Allow convertmapping to be extended	2018-06-14 21:25:33 +09:00
smoogipoo	024d2abfe0	Always generate mappings/convert values as soon as objects are converted ... # Conflicts: # osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs	2018-06-14 21:25:23 +09:00
smoogipoo	8d0e7abdd6	Some rulesets don't have a beatmap processor	2018-06-14 21:23:11 +09:00
smoogipoo	5e66b02108	Process beatmap before generating mappings	2018-06-14 21:22:56 +09:00
Dean Herbert	b318b770d4	Fix pixellation of volume meter progress bars	2018-06-13 19:22:39 +09:00
Dean Herbert	0fdb04f57d	Fix empty line	2018-06-13 15:43:18 +09:00
Dean Herbert	3ac90511c9	Merge branch 'master' into fix-memory-leak	2018-06-13 15:27:39 +09:00
Dean Herbert	39738a997e	Add check for player screens too	2018-06-13 15:26:23 +09:00
Dean Herbert	14f5c814a6	Add test for WorkingBeatmap leakage	2018-06-13 15:12:10 +09:00
Dan Balasescu	0e0e64895a	Merge branch 'master' into mania-step-interval	2018-06-13 13:55:27 +09:00
Dean Herbert	a7ed3ea80b	Rename alwaysVisible to explain where it comes from	2018-06-13 11:38:15 +09:00
Dean Herbert	d9e7a324c0	Revert HudOverlay to private field	2018-06-13 11:30:22 +09:00
smoogipoo	67aa52fb1d	Use bindable binding	2018-06-12 19:34:49 +09:00
Dean Herbert	bcfb092e53	Change step to 200	2018-06-12 18:03:45 +09:00
smoogipoo	c70c7a476b	Always display the key counter during replay/autoplay	2018-06-12 17:59:59 +09:00
Dan Balasescu	80ec0b1839	Merge branch 'master' into populate-missing-online-ids	2018-06-12 14:03:23 +09:00
Dean Herbert	ae136e89a4	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Dan Balasescu	0a35a81c2d	Merge branch 'master' into populate-missing-online-ids	2018-06-12 13:11:21 +09:00
Dean Herbert	37ea4c273b	Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework	2018-06-11 20:17:41 +09:00
Dean Herbert	8092d70402	Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework	2018-06-11 20:17:33 +09:00
Dan Balasescu	7de8e1cfc4	Merge branch 'master' into refactor-api	2018-06-11 18:49:15 +09:00
Dan Balasescu	3981f56157	Merge branch 'master' into exponential-scoring-toggle	2018-06-11 18:34:55 +09:00
Dan Balasescu	78daf1c7ad	Merge branch 'master' into exponential-scoring-toggle	2018-06-11 18:19:33 +09:00
smoogipoo	b9391b3c6b	Fix bindable not working under non-debug due to weak references	2018-06-11 18:18:24 +09:00
Dan Balasescu	9994c69d58	Merge branch 'master' into fix-object-ordering	2018-06-11 17:53:33 +09:00
smoogipoo	b51e714ae5	Fix xmldoc	2018-06-11 15:44:59 +09:00
smoogipoo	14b7530994	Use a global ruleset config cache	2018-06-11 15:07:42 +09:00
smoogipoo	be01dbae3a	Move ruleset dependency caching to CreateLocalDependencies ... In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.	2018-06-11 15:07:29 +09:00
smoogipoo	f4fbf27d42	Give ruleset settings a ruleset-specific config manager	2018-06-11 13:28:50 +09:00
smoogipoo	eca016ec6c	Move ruleset config managers to Ruleset	2018-06-11 13:17:08 +09:00
smoogipoo	22e8a0bb6e	Make ruleset config manager variants nullable	2018-06-11 13:13:36 +09:00
smoogipoo	63ec36b3be	Explicitly handle null settings case + add annotations	2018-06-11 12:57:56 +09:00
smoogipoo	b219c17115	Move dependency creation under ctor	2018-06-11 12:57:26 +09:00
Dean Herbert	86fb9666b2	Rename "Exponential" to "Classic"	2018-06-10 01:45:05 +09:00
Dean Herbert	cc37a355d2	Add comment about matching stable scoring ... Also updated equation to be close to what is expected	2018-06-10 01:44:46 +09:00
Dean Herbert	aaa65c428f	Merge branch 'master' into diffcalc-modtypes	2018-06-09 23:35:17 +09:00
Dean Herbert	d3570df64f	Merge pull request #2764 from peppy/update-dependencies ... Update framework and other packages	2018-06-08 22:07:25 +09:00
Dean Herbert	a5ddae3f37	Merge pull request #2763 from peppy/revert-update-subtree ... Revert InputManager UpdateSubTree change	2018-06-08 22:06:55 +09:00
Dean Herbert	fd4f61fc88	Update framework and other packages	2018-06-08 21:51:43 +09:00