8577 Commits

Author	SHA1	Message	Date
Dean Herbert	4a92d1ddb6	Merge branch 'master' into fix-testruleset-issues	2018-05-14 20:21:49 +09:00
Dean Herbert	addb864d10	Allow help text to wrap	2018-05-14 19:56:03 +09:00
Dan Balasescu	d40efd3134	Merge branch 'master' into fix-testruleset-issues	2018-05-14 19:39:56 +09:00
smoogipoo	47cf4f27fb	Fix possibility of test rulesets being discovered from assemblies	2018-05-14 19:39:23 +09:00
Dean Herbert	28edf3bce7	Merge branch 'master' into hud-above-letterbox	2018-05-14 19:31:39 +09:00
ocboogie	d441fd53b9	Merge branch 'master' into ruleset-keybindings	2018-05-14 03:27:35 -07:00
smoogipoo	17861c2a16	Display "no key bound" when no shortcut	2018-05-14 19:20:53 +09:00
Dean Herbert	0234bbc37f	Move definition inline	2018-05-14 19:14:17 +09:00
Dean Herbert	f14948c022	Merge branch 'master' into exit-hold-confirmation	2018-05-14 18:13:40 +09:00
smoogipoo	115c2dc239	Move hud below the skip button	2018-05-14 18:02:18 +09:00
smoogipoo	027f6c3fa4	Fix instant movement not doing anything	2018-05-14 17:47:38 +09:00
smoogipoo	4ceae6ba1f	Inline method	2018-05-14 17:45:11 +09:00
smoogipoo	6eb7590ab0	Make MusicController handle all movement to previous/next tracks	2018-05-14 17:42:01 +09:00
ocboogie	bfcfeec9b9	Merge branch 'master' into ruleset-keybindings	2018-05-14 01:28:57 -07:00
Dean Herbert	fe1c1fec0d	Stop overlays from handling DragStart ... This was causing weird behaviour with the key configuration section and back button in settings.	2018-05-14 15:44:19 +09:00
smoogipoo	64fba5f6d1	Proxy the ruleset cursor above the break overlay	2018-05-14 15:36:56 +09:00
smoogipoo	43409127b7	Place break overlay underneath the hud	2018-05-14 15:36:42 +09:00
Dean Herbert	39970c831e	Merge branch 'master' into fix-diffcalc-timerates	2018-05-14 15:19:51 +09:00
smoogipoo	f5068804d5	Re-enable slider distance overflow ... Fixes #2467.	2018-05-14 15:14:29 +09:00
Dean Herbert	345e213eff	Merge branch 'master' into fix-wedge-nullref	2018-05-14 15:08:48 +09:00
Dean Herbert	5c41e7c39c	Merge pull request #2527 from peppy/fix-mousewheel-startup-crash ... Fix crash on startup when adjusting volume before volume control loaded	2018-05-14 14:23:08 +09:00
Dean Herbert	ecd8b69e5e	Merge branch 'master' into fix-diffcalc-timerates	2018-05-14 14:22:39 +09:00
Dan Balasescu	d7cba000ab	Merge branch 'master' into fix-wedge-nullref	2018-05-14 13:36:07 +09:00
Dan Balasescu	2e648a90c8	Merge branch 'master' into fix-song-progress-counters	2018-05-14 13:27:50 +09:00
smoogipoo	a81921118d	Strip whitespaces	2018-05-14 11:54:11 +09:00
ocboogie	ebd9d1a037	Resolve linting issues in ToolbarModeSelector.cs	2018-05-13 19:43:26 -07:00
ocboogie	327c7432be	Use OnKeyDown instead of a IKeyBindingHandler	2018-05-13 19:33:52 -07:00
smoogipoo	6e1d651087	Merge remote-tracking branch 'origin/master' into convert-object-hitwindows	2018-05-14 11:17:39 +09:00
smoogipoo	e1b8a1589b	Fix TimeRate not being considered for performance calculation	2018-05-14 11:15:14 +09:00
Dean Herbert	ede4d6dd11	Merge branch 'master' into mapping-del	2018-05-14 10:58:58 +09:00
Dean Herbert	db0470243a	Fix nullref when changing ruleset at main menu	2018-05-13 12:55:54 +09:00
ocboogie	26f06a9ae1	Resolve linting issues in ToolbarModeSelector.cs	2018-05-12 17:25:15 -07:00
ocboogie	76800421c4	Merge branch 'master' into ruleset-keybindings	2018-05-12 16:40:27 -07:00
ocboogie	8a5bd27c20	Add global key bindings for changing current ruleset	2018-05-12 16:30:29 -07:00
Dean Herbert	a162453e9b	Merge remote-tracking branch 'upstream/master' into joystick ... # Conflicts: # osu-framework # osu.Game/Overlays/KeyBinding/KeyBindingRow.cs	2018-05-13 00:11:17 +09:00
AlFasGD	2a90686da6	Simplify expression	2018-05-12 15:09:53 +03:00
Dean Herbert	36af7feab3	Merge branch 'master' into diffcalc-fixes	2018-05-12 21:01:58 +09:00
DrabWeb	937ff50a5a	Remove unused using.	2018-05-11 13:56:27 -03:00
DrabWeb	41de02fc78	Make DrawableRooms select when they are clicked.	2018-05-11 13:43:53 -03:00
DrabWeb	518dec0c68	Merge https://github.com/ppy/osu into drawable-room-improvements	2018-05-11 13:41:50 -03:00
Dean Herbert	a14531b9a4	Fix crash on startup when adjusting volume before volume control loaded	2018-05-11 22:57:36 +09:00
Dean Herbert	cfa18bdf1f	Fix song progress time counters wrapping after an hour ... Resolves #2466. Supersedes and closes #2487.	2018-05-11 22:10:26 +09:00
smoogipoo	7e7a5f8964	Fix score accuracy not being populated	2018-05-11 21:49:10 +09:00
smoogipoo	8ca67f63ec	Fix score statistics not being read	2018-05-11 21:49:06 +09:00
Dean Herbert	aa5d5ab2a8	Fix readonly field	2018-05-11 21:48:35 +09:00
Dean Herbert	f1fd2ae7be	Merge branch 'master' into modmouseup	2018-05-11 21:41:14 +09:00
Dean Herbert	4fc887b25f	Add a pressing effect to make mouse up response feel good	2018-05-11 21:40:36 +09:00
Dean Herbert	c19432dc6d	Merge branch 'master' into ruleset-beatmap-statistics	2018-05-11 17:37:50 +09:00
Dean Herbert	2afc0c1abd	Merge branch 'master' into breadcrumb-design-adjustments	2018-05-11 17:19:26 +09:00
DrabWeb	fa403e4e2a	Add test step to test pushing after a previous screen is made current.	2018-05-11 04:49:40 -03:00