7889 Commits

Author	SHA1	Message	Date
Aergwyn	4d528c4e67	fix VisualTests and Samples still playing	2018-05-20 10:57:15 +02:00
DrabWeb	9cd0ec366e	Cleanup.	2018-05-19 02:51:51 -03:00
DrabWeb	136c57b824	Don't set size in ctor.	2018-05-19 02:27:33 -03:00
DrabWeb	ad878003f7	Add null room support to RoomInspector.	2018-05-19 02:23:09 -03:00
DrabWeb	4b2b2086df	Create drawable hierarchy for RoomInspector in load, remove display* methods.	2018-05-19 01:26:39 -03:00
Dean Herbert	e5aa1a038e	Merge branch 'master' into fix-hr-application	2018-05-18 18:37:51 +09:00
smoogipoo	e6e3758304	Fix HR mod affecting original beatmap difficulty ... Fixes #2575.	2018-05-18 18:11:52 +09:00
Aergwyn	67db539172	prevent Overlays from showing in intro/outro sequences	2018-05-18 08:00:05 +02:00
Dean Herbert	d75fe4009a	Add back action support to settings back button	2018-05-18 13:40:35 +09:00
Dean Herbert	e2389ad7a4	Allow using back button on PlayerLoader and Replay	2018-05-18 13:32:05 +09:00
Dean Herbert	1cda5f4de9	Merge branch 'master' into back_mouse_button_support	2018-05-18 12:55:52 +09:00
Dean Herbert	6c00046835	Merge branch 'master' into mania-performance-calculator	2018-05-18 12:34:49 +09:00
Dean Herbert	8e784d9104	Merge branch 'master' into fix-conversion-hitwindows	2018-05-18 11:59:16 +09:00
Roman Kapustin	17d1759c37	Get rid of multiple blank lines in a row	2018-05-18 01:01:54 +03:00
Roman Kapustin	81d7e8a393	Resolve merge conflict	2018-05-18 00:25:47 +03:00
DrabWeb	ebfbe58abb	Move Header breadcrumbs to a subclass.	2018-05-17 06:19:55 -03:00
Dean Herbert	d20011ba58	Fix an endless feedback loop	2018-05-17 17:56:29 +09:00
Dean Herbert	7c9d3c9742	Merge branch 'master' into multiplayer-base-screen	2018-05-17 17:41:31 +09:00
smoogipoo	43cdbec0a3	Fix hold note hitwindow lenience	2018-05-17 13:59:04 +09:00
smoogipoo	f67d263596	Move ruleset-specific hitwindows to post-converted hitobjects	2018-05-17 13:35:15 +09:00
Dean Herbert	d36c2686c9	Merge branch 'master' into beatmap-parsing-performance	2018-05-17 13:28:35 +09:00
smoogipoo	397d93660a	Don't deep-clone beatmapinfo/control points	2018-05-17 13:17:33 +09:00
DrabWeb	650d40f57f	Merge https://github.com/ppy/osu into multiplayer-base-screen	2018-05-17 00:34:40 -03:00
smoogipoo	c67f372560	Don't create nested hitobjects unless absolutely required	2018-05-17 12:29:33 +09:00
Dean Herbert	47cd9065bf	Merge branch 'master' into screen-breadcrumbs	2018-05-16 18:42:17 +09:00
smoogipoo	0f817d18d4	Add explanatory comment	2018-05-16 13:59:51 +09:00
Dan Balasescu	ad81357fb5	Merge branch 'master' into fix-hitobject-order	2018-05-16 13:33:27 +09:00
Dean Herbert	452564d0e0	Merge branch 'master' into screen-breadcrumbs	2018-05-16 13:31:38 +09:00
smoogipoo	cf44357bdb	Use a stable sort for hitobjects	2018-05-16 13:30:48 +09:00
smoogipoo	8d8b7e6fa2	Fix conversion tests for ruleset-specific beatmaps not working ... TRuleset was a mistake. This resulted in cases that checked whether the beatmap was for the current ruleset (TaikoBeatmapConverter and ManiaBeatmapConverter) failing due to TestXRuleset != XRuleset...	2018-05-16 13:09:48 +09:00
DrabWeb	1a78ac3d10	Add Multiplayer screen.	2018-05-15 21:14:10 -03:00
DrabWeb	1450bf64f5	Add multiplayer screen header.	2018-05-15 20:34:14 -03:00
DrabWeb	b9d99b5f40	Fix nullref when exiting the last screen.	2018-05-15 19:42:50 -03:00
smoogipoo	de63a1b578	Remove construction of new ruleset	2018-05-16 01:43:58 +09:00
Dean Herbert	c0c449e453	Remove unused using	2018-05-15 22:53:33 +09:00
smoogipoo	3f67d04429	Cap CS to 10 also	2018-05-15 21:57:08 +09:00
smoogipoo	4101b8ddde	Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements	2018-05-15 21:31:58 +09:00
smoogipoo	1acfc1bbab	Fix ModHardRock not properly clamping Drain/OD	2018-05-15 21:25:20 +09:00
Dean Herbert	28df77e838	Simplify code and remove generic	2018-05-15 21:10:26 +09:00
Dean Herbert	0325b1bd7a	Remove unused class	2018-05-15 19:42:30 +09:00
Dean Herbert	0def847f60	Merge branch 'master' into screen-breadcrumbs	2018-05-15 19:39:03 +09:00
Dean Herbert	fc192c8998	Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons	2018-05-15 19:23:51 +09:00
Dean Herbert	6bf1092c7d	Merge branch 'master' into enable-distance-overflow	2018-05-15 18:56:51 +09:00
Dean Herbert	0e0cc8bb69	Merge branch 'master' into namespace-cleanup	2018-05-15 18:10:48 +09:00
smoogipoo	995fda9b6f	Move base classes to osu.Game.Rulesets.Difficulty namespace	2018-05-15 17:38:08 +09:00
Dean Herbert	e39af1c906	Merge branch 'master' into convert-object-hitwindows	2018-05-15 17:33:27 +09:00
Dean Herbert	6d87ff2595	Merge branch 'master' into enable-distance-overflow	2018-05-15 16:18:17 +09:00
Dean Herbert	f2580e5656	Merge branch 'master' into score-parser-deriving	2018-05-15 15:42:01 +09:00
smoogipoo	1ee68c1c54	Make LegacyScoreParser abstract	2018-05-15 15:28:46 +09:00
Dean Herbert	5fee471307	Merge branch 'master' into beatmap-delete-fix	2018-05-15 14:49:09 +09:00
smoogipoo	fe2ea17e7f	Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval	2018-05-15 11:42:40 +09:00
ocboogie	4055a6fc0c	Merge branch 'master' into ruleset-keybindings	2018-05-14 15:39:10 -07:00
Roman Kapustin	f2f2fb8c73	Use both OnKeyDown and GlobalAction.Back	2018-05-14 22:09:09 +03:00
Roman Kapustin	e802b722f0	Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction" ... This reverts commit 44bbb8700e.	2018-05-14 20:27:05 +03:00
Dean Herbert	7507d18a93	Merge branch 'master' into mapping-del	2018-05-14 20:56:12 +09:00
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