702 Commits

Author	SHA1	Message	Date
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
Dean Herbert	1de296747f	Merge remote-tracking branch 'upstream/master' into social-browser	2017-06-07 17:38:06 +09:00
Dean Herbert	5f537780cf	Bring framework up-to-date	2017-06-07 15:32:50 +09:00
Dean Herbert	bf971f6613	Merge branch 'master' into social-browser	2017-06-05 19:16:28 +09:00
Dean Herbert	af6f8bbd89	Fix namespaces and class names	2017-06-05 16:47:42 +09:00
Dean Herbert	0cb1df35e9	Merge remote-tracking branch 'upstream/master' into ingame_options	2017-06-05 14:53:37 +09:00
Thomas Müller	0afb188cde	Remove unused using	2017-06-03 20:05:51 +02:00
Thomas Müller	04925594ca	Merge branch 'master' into separate-skip	2017-06-03 17:45:57 +02:00
Thomas Müller	d498a4a022	Trim whitespace	2017-06-03 17:45:44 +02:00
Thomas Müller	8cd2f509ef	Move skip button into its own test, because it is no longer two-layered	2017-06-03 17:33:24 +02:00
Thomas Müller	3daae480d2	Remove TestCaseTooltip	2017-06-03 17:28:34 +02:00
Jorolf	a43890ffb4	update osu to use the framework's TooltipContainer	2017-06-03 14:50:35 +02:00
DrabWeb	c9403c5200	Incorrect test data spelling	2017-05-31 21:32:50 -03:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
smoogipooo	7416952eb3	Fix usings.	2017-05-30 17:36:42 +09:00
smoogipooo	72fa50f944	Make replay settings match design colours.	2017-05-30 17:02:04 +09:00
EVAST9919	08219ccb42	Applied suggested changes	2017-05-29 19:00:29 +03:00
Dean Herbert	5e4558cc54	Merge branch 'master' into social-browser	2017-05-29 18:35:22 +09:00
Dan Balasescu	6918368afc	Merge branch 'master' into ingame_options	2017-05-29 18:12:02 +09:00
Dean Herbert	4a0c8fb5dd	Merge branch 'master' into breadcrumbs	2017-05-29 15:59:37 +09:00
smoogipooo	27d6cb6275	Merge remote-tracking branch 'origin/master' into mania-holdnote-input	2017-05-29 10:57:49 +09:00
Seth	0e087994a1	Merge branch 'master' into social-browser	2017-05-28 15:11:00 -03:00
Dean Herbert	20c7a5e931	Merge branch 'master' into user-panel-test-data	2017-05-28 23:19:16 +09:00
Dean Herbert	bdeaf2dbb4	Update method names in line with framework changes	2017-05-28 18:34:12 +09:00
EVAST9919	743dfcc130	More xmldoc and few Title text fixes	2017-05-28 00:56:11 +03:00
DrabWeb	e7087f22ea	Change UserPanel test case data to use always available covers	2017-05-27 17:27:11 -03:00
DrabWeb	7bdbd3713a	More reliable test data	2017-05-27 17:23:14 -03:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
DrabWeb	cbe36259c3	Add BreadcrumbControl	2017-05-26 07:49:45 -03:00
smoogipooo	24ff599901	Merge remote-tracking branch 'origin/master' into mania-holdnote-input	2017-05-26 19:01:10 +09:00
DrabWeb	fc67582c3f	Cleanup	2017-05-26 02:16:56 -03:00
DrabWeb	e19a4f5e6f	Add displaying users	2017-05-26 02:00:38 -03:00
DrabWeb	8fca0fddb3	Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser	2017-05-26 00:54:03 -03:00
Dan Balasescu	40e63a0870	Merge branch 'master' into mania-holdnote-input	2017-05-24 22:17:13 +09:00
smoogipooo	946cd4bfa3	General cleanup + more xmldocs.	2017-05-24 21:57:38 +09:00
smoogipooo	4ef18ff135	Test case improvements.	2017-05-24 20:54:01 +09:00
smoogipooo	dcf879687d	Implement basic hold note + tick input.	2017-05-24 20:45:01 +09:00
Seth	3094a8267f	Merge branch 'master' into drawable-multiplayer-room	2017-05-24 04:39:57 -03:00
Dean Herbert	3134f92051	Merge branch 'master' into user-panel	2017-05-24 16:32:09 +09:00
DrabWeb	a25c504965	CI fixes	2017-05-24 03:08:48 -03:00
DrabWeb	ba2627d4e2	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-24 02:40:00 -03:00
DrabWeb	4490596f5f	Keep one object per file	2017-05-24 02:37:27 -03:00
DrabWeb	2be1b00a76	Hide status bar when Status is null	2017-05-24 00:45:56 -03:00
DrabWeb	247d8e9b21	Replace "Connected as _" in login form with a UserPanel	2017-05-24 00:23:48 -03:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
DrabWeb	4f17a4fe91	Make result counts scroll with the panels	2017-05-23 14:34:34 -03:00
smoogipooo	76fe4af9a6	Fix visual test failing.	2017-05-23 18:06:31 +09:00
smoogipooo	836bf930a0	More cleanups.	2017-05-23 15:29:38 +09:00
smoogipooo	002a0e99a2	Use SortedList + BinarySearch to find control points at time values.	2017-05-23 15:20:32 +09:00
smoogipooo	3cdfd2eef5	Split ControlPoint into different types. ... # Conflicts: # osu.Game.Rulesets.Mania/UI/Column.cs	2017-05-23 14:03:40 +09:00