8225 Commits

Author	SHA1	Message	Date
Dean Herbert	ae160baa6e	Merge branch 'master' into timeline-input-adjustment	2018-06-18 02:54:25 +09:00
Dean Herbert	a20ec0d4cc	Merge branch 'master' into timeline-audio-scrolling	2018-06-17 19:01:21 +09:00
Dean Herbert	e0ee5e2085	Merge branch 'master' into timeline-audio-scrolling	2018-06-17 19:01:16 +09:00
Dean Herbert	a6437c005c	Merge branch 'master' into diffcalc-rework	2018-06-15 18:02:18 +09:00
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
smoogipoo	8f7334874c	Fix up performance calculators	2018-06-14 16:04:48 +09:00
smoogipoo	540b43313e	Remove PP test cases (osu-tools/osu-server should be used instead)	2018-06-14 15:57:06 +09:00
smoogipoo	b7a06b9594	Restructure of DifficultyCalculator to cleanup mod + attribute handling	2018-06-14 15:32:07 +09:00
smoogipoo	1431ee1867	Remove unused method	2018-06-14 14:46:25 +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	ca3186f34c	Create dependencies before children are loaded	2018-06-12 19:51:35 +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
smoogipoo	3b396e38ca	Hide the scrollbar	2018-06-12 15:51:48 +09:00
smoogipoo	aaf2f66594	Make scrolling only zoom the timeline	2018-06-12 15:51:36 +09:00
Dan Balasescu	f71b0456e8	Merge branch 'master' into timeline-audio-scrolling	2018-06-12 14:23:05 +09:00
smoogipoo	30b7b7961f	Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling ... # Conflicts: # osu-framework # osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs	2018-06-12 14:22:27 +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