1077 Commits

Author	SHA1	Message	Date
DrabWeb	9942733b63	Trim whitespace	2017-05-31 05:22:54 -03:00
Seth	394745bca5	Merge branch 'master' into social-browser	2017-05-31 05:18:52 -03:00
Dean Herbert	bab3f1b89a	Merge branch 'master' into user-dropdown-arrow	2017-05-31 15:39:52 +09:00
EVAST9919	8cde50a88a	Merge branch 'master' of https://github.com/ppy/osu into ingame_options	2017-05-31 08:23:06 +03:00
DrabWeb	cd57343191	Text -> Label	2017-05-31 02:03:13 -03:00
DrabWeb	4fd7405fb8	Fix user dropdown menu item chevron alignment	2017-05-31 01:57:32 -03:00
Dean Herbert	8544b45443	Update in line with framework	2017-05-30 22:23:51 +09:00
Dean Herbert	6a6f0913cd	Merge branch 'master' into social-browser	2017-05-30 20:51:50 +09:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
EVAST9919	963d6e9e8f	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-30 12:04:41 +03:00
DrabWeb	3aa1f35127	Basic layout	2017-05-30 05:12:11 -03:00
DrabWeb	a1453eb9e1	Fix filter text box input	2017-05-29 22:52:38 -03:00
DrabWeb	b6cb9d3229	Fix display style dropdown scaling the filter control	2017-05-29 22:39:59 -03:00
DrabWeb	2edbf64d69	Redundant parentheses	2017-05-29 22:22:14 -03:00
DrabWeb	96efa5a240	Hook up to channel selector tab item	2017-05-29 22:10:07 -03:00
DrabWeb	b9292b6240	Merge https://github.com/ppy/osu into channel-selection	2017-05-29 22:06:05 -03:00
DrabWeb	2ba86cffa6	Channel list item hover effect	2017-05-29 22:04:53 -03:00
DrabWeb	d8e86da78c	Better scroll dragger position	2017-05-29 22:00:15 -03:00
Dean Herbert	e91a3f06f1	Merge remote-tracking branch 'upstream/master' into channel-selector-tab-item	2017-05-30 09:54:35 +09:00
Dean Herbert	fde579262f	User a simpler method to hide the background icon	2017-05-30 09:54:29 +09:00
DrabWeb	d29bf58817	Show scroll dragger	2017-05-29 21:50:15 -03:00
DrabWeb	745e2e5e18	Make the channel selection overlay hide/resize with chat	2017-05-29 21:23:03 -03:00
DrabWeb	50e50ce67e	Update with framework changes	2017-05-29 20:33:28 -03:00
DrabWeb	21a8071293	Merge https://github.com/ppy/osu into channel-selection	2017-05-29 20:31:35 -03:00
EVAST9919	261f1f4e1f	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-29 18:13:44 +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
Dan Balasescu	e4b876ff5b	Update ModButton.cs	2017-05-29 18:10:02 +09:00
Dean Herbert	7960b5cf26	More refactoring ... Also allows rotation when reaching the end of the available mods.	2017-05-29 18:03:40 +09:00
Dean Herbert	5e473c6c96	Merge remote-tracking branch 'upstream/master' into better-multimod-animation	2017-05-29 17:21:49 +09:00
Dean Herbert	31cc6917bc	Tidy up code, improve transition, add directionality	2017-05-29 17:20:55 +09:00
Dean Herbert	7b52c4621d	Merge branch 'master' into musiccontroller-init-fix	2017-05-29 10:28:56 +09:00
DrabWeb	8994c57f3c	Update with framework changes	2017-05-28 15:14:22 -03:00
Seth	0e087994a1	Merge branch 'master' into social-browser	2017-05-28 15:11:00 -03:00
jorolf	9a4abcc199	Merge branch 'master' into better-multimod-animation	2017-05-28 14:39:04 +02:00
Thomas Müller	bb14708165	Merge branch 'master' into fix-chat-overlay-drift	2017-05-28 14:38:39 +02:00
Dean Herbert	bc47dedf27	Add non-null assertion	2017-05-28 21:34:15 +09:00
Dean Herbert	3644198c6e	Fix CI issues	2017-05-28 21:20:11 +09:00
Dean Herbert	ed8b34d5ed	Fix drift when dragging chat beyond bounds	2017-05-28 21:11:46 +09:00
Dean Herbert	d749fc516d	Update focus handling in line with framework changes	2017-05-28 20:08:46 +09:00
Dean Herbert	bdeaf2dbb4	Update method names in line with framework changes	2017-05-28 18:34:12 +09:00
DrabWeb	816caf86ea	Better exception for SearchableListFilterControl's generic type argument not being an enum	2017-05-27 18:49:55 -03:00
DrabWeb	239472c451	Lowercase hex colours	2017-05-27 18:35:46 -03:00
DrabWeb	b88c07f1a0	Make channel readonly	2017-05-27 17:49:57 -03:00
DrabWeb	754fe956f9	Make ChannelSection headers uppercase in the setter	2017-05-27 17:40:20 -03:00
DrabWeb	b632e7f1ad	Accept Channel in ctor and remove Channel property	2017-05-27 17:35:42 -03:00
Jorolf	e86ccf61b3	use recursion	2017-05-27 10:11:59 +02:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
Jorolf	db1dde72de	change constant names	2017-05-26 16:29:15 +02:00
Jorolf	64612ef34b	add multimod animation	2017-05-26 16:10:28 +02:00
jorolf	f6f1ea42ee	Merge branch 'master' into channel-selector-tab-item	2017-05-26 13:18:50 +02:00
Jorolf	1e4bca90f0	remove duplicate code	2017-05-26 12:10:16 +02:00
DrabWeb	c0999c7fc1	Unused using directives	2017-05-26 06:12:22 -03:00
DrabWeb	12f6276e05	Move DisplayStyleControl to all FilterControls	2017-05-26 06:05:05 -03:00
DrabWeb	38d0138978	CI fixes	2017-05-26 04:11:45 -03:00
DrabWeb	ae96ef08f7	Tab character	2017-05-26 04:02:04 -03:00
DrabWeb	4c551270e9	Add OnRequestLeave	2017-05-26 03:56:10 -03:00
DrabWeb	d632435a34	Make ChannelListItems scale better	2017-05-26 03:51:09 -03:00
DrabWeb	21e900df73	Transition code cleanup	2017-05-26 03:46:50 -03:00
DrabWeb	d29ebb139f	Cleanup	2017-05-26 03:38:52 -03:00
DrabWeb	64016f9466	Merge https://github.com/ppy/osu into channel-selection	2017-05-26 03:24:41 -03:00
DrabWeb	5785715ad5	CI fixes	2017-05-26 03:10:36 -03:00
DrabWeb	28ee00109d	Wave colours	2017-05-26 02:55:25 -03:00
DrabWeb	8359f6ced0	Incorrect colour	2017-05-26 02:49:04 -03:00
DrabWeb	68377494f7	Browser - SearchableList	2017-05-26 02:44:09 -03:00
DrabWeb	5831da6978	Autohide social when entering a screen that doesn't allow overlays, fix potential nullrefs in DirectOverlay, CreateControls -> CreateSupplementaryControls	2017-05-26 02:32:01 -03: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	5c0d0cb7e7	Alpha on wrong object	2017-05-26 01:34:30 -03:00
DrabWeb	2d3995b85c	Fix filter controls having margin when no controls given, add DisplayStyleControl to social, misc cleanups	2017-05-26 01:32:20 -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
Dean Herbert	8ae7e84563	Merge branch 'master' into musiccontroller-init-fix	2017-05-26 10:48:32 +09:00
Jorolf	a9658ec66f	update colour, width, icon and text	2017-05-25 20:25:59 +02:00
MrTheMake	9de7e7bc40	Fixes	2017-05-25 17:49:47 +02:00
Dean Herbert	9eec2edd30	Fix initial login state not being reflected in user panel	2017-05-25 22:43:33 +09:00
MrTheMake	c32d816f9c	Removed new line	2017-05-25 14:19:04 +02:00
MrTheMake	9ea70b849b	Fix initialize beatmap change animation of the music controller	2017-05-25 14:16:51 +02:00
Dean Herbert	1a255fdf48	Fix display order regression	2017-05-25 19:47:18 +09:00
Dean Herbert	be81346573	Attempt to fix inner scope warning	2017-05-25 14:47:25 +09:00
DrabWeb	e22eb1f205	CI fixes	2017-05-24 22:39:07 -03:00
DrabWeb	ec3c92fc3c	Trim whitespace	2017-05-24 22:26:48 -03:00
DrabWeb	9cad344401	Revert back header for login form, fix incorrect spacing on header	2017-05-24 22:02:32 -03:00
DrabWeb	8e09b738b0	Remove magic numbers	2017-05-24 21:51:00 -03:00
DrabWeb	9b863f60ab	Adjust dropdown layout	2017-05-24 21:32:46 -03:00
DrabWeb	efd4c57431	Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem	2017-05-24 21:09:18 -03:00
DrabWeb	b57a3f2056	Initial layout of user panel and user dropdown	2017-05-24 19:44:48 -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	72c9959215	resultCounts -> ResultAmounts	2017-05-24 02:40:34 -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	e59c1879a2	Remove tabs	2017-05-24 02:38:55 -03:00
DrabWeb	4490596f5f	Keep one object per file	2017-05-24 02:37:27 -03:00
DrabWeb	b08668b6d9	Remove @ from to-be-localized strings	2017-05-24 02:19:45 -03:00
Dean Herbert	5e01940770	Compare with private field	2017-05-24 13:43:10 +09: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	be1ae2bd8e	Remove ??, value can never be null	2017-05-23 15:08:02 -03:00
DrabWeb	7a4b476121	Tab character	2017-05-23 14:46:23 -03:00
DrabWeb	aa9a636c3c	Indentation	2017-05-23 14:42:57 -03:00
DrabWeb	7b9eacc213	CI fixes	2017-05-23 14:41:30 -03:00
DrabWeb	fbbcc80a3e	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-23 14:34:58 -03:00
DrabWeb	4f17a4fe91	Make result counts scroll with the panels	2017-05-23 14:34:34 -03:00
Jorolf	af9b02746a	make fields readonly	2017-05-23 18:19:01 +02:00
Jorolf	7ad10009e6	Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item	2017-05-23 17:32:48 +02:00
EVAST9919	2ca0794b37	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-23 14:45:38 +03:00
EVAST9919	564abc1a5b	using autosize instead of constant height	2017-05-23 14:32:45 +03:00
EVAST9919	165d6ef1bb	Make transition a bit smoother	2017-05-23 12:30:39 +03:00
EVAST9919	c7a241246e	Better letterbox settings transition	2017-05-23 12:09:32 +03:00
Dean Herbert	0634a3a5c5	Merge branch 'master' into osu-direct	2017-05-23 17:33:20 +09:00
DrabWeb	62897d302e	Remove SettingsButton(old and outdated design), fix channel list scrolling under the header	2017-05-22 22:37:25 -03:00
Dean Herbert	5c5a18833a	Merge branch 'master' into channel-selector-tab-item	2017-05-22 20:22:57 +09:00
Huo Yaoyuan	63259a3457	Fix depth of header background. ... Thanks to the order of adding to parent container, the depth value is actually not needed.	2017-05-22 16:00:03 +08:00
DrabWeb	bdab545ca4	Use BeatmapBackgroundSprite	2017-05-22 03:15:22 -03:00
DrabWeb	77affc1eb7	Split onto multiple lines	2017-05-22 03:13:55 -03:00
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
DrabWeb	3c35badf06	Unused using	2017-05-22 02:03:53 -03:00
DrabWeb	6bf0ca59fe	Make FilterControl not scroll with the panels	2017-05-22 02:03:26 -03:00
Huo Yaoyuan	d0ff9e6576	Merge branch 'master' into sections	2017-05-22 12:52:27 +08:00
Dean Herbert	93182e5da3	Merge branch 'master' into generic-interface	2017-05-22 09:52:40 +09:00
DrabWeb	4e2126dca8	Fix nullref when changing display mode without any BeatmapSets added	2017-05-21 18:54:35 -03:00
DrabWeb	eb77c94150	Fix search field losing focus	2017-05-21 15:30:10 -03:00
EVAST9919	8c1437c51a	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-21 13:44:52 +03:00
DrabWeb	51bc3dfe72	Padding below channel list, remove text shadows, fix search box focusing	2017-05-20 21:38:36 -03:00
DrabWeb	a60d1efc21	Basic channel joining (ignore layout in ChatOverlay, temporary)	2017-05-20 21:26:39 -03:00
DrabWeb	4a166c1949	Make ChannelSelectionOverlay a FocusedOverlayContainer	2017-05-20 20:48:36 -03:00
DrabWeb	2e1d01a268	Added searching	2017-05-20 20:22:55 -03:00
DrabWeb	47dfc0d7bc	Added transition	2017-05-20 20:05:28 -03:00
DrabWeb	7eba619f80	Move Joined to Channel	2017-05-20 19:37:11 -03:00
DrabWeb	3cc51006cc	Add settings button, background triangles, proper displaying of Channels	2017-05-20 19:30:40 -03:00
DrabWeb	6a8d745db1	Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned	2017-05-20 18:29:57 -03:00
DrabWeb	31890a1e01	Initial layout, channels items	2017-05-20 18:06:25 -03:00
Huo Yaoyuan	4a55666e03	Merge branch 'master' into sections	2017-05-21 04:43:39 +08:00
Huo Yaoyuan	f06f8b4dcd	Make sidebar buttons working.	2017-05-21 04:33:05 +08:00
Huo Yaoyuan	aa409ac1a9	Move SearchTextBox out of SettingsHeader.	2017-05-21 04:12:16 +08:00
Huo Yaoyuan	35712514a4	Update settings UI using SectionsContainer basically.	2017-05-21 03:50:04 +08:00
DrabWeb	87ace2d7ec	@"" -> string.Empty	2017-05-20 13:52:51 -03:00
DrabWeb	49eb096b03	Fix visual test mode toggle buttons activation state	2017-05-20 13:19:50 -03:00
Dean Herbert	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
Dean Herbert	fb72693c96	Merge branch 'master' into playlist-item-paragraph	2017-05-20 15:47:54 +09:00
DrabWeb	995a573b9c	@"" -> string.Empty	2017-05-20 03:22:37 -03:00
DrabWeb	7485a78128	Update framework	2017-05-20 03:14:22 -03:00
DrabWeb	139b03a1ce	Only recreate text once per unicode option change	2017-05-20 02:05:13 -03:00
DrabWeb	43bd0f686b	Fix artist being the opposite value	2017-05-20 01:25:42 -03:00
DrabWeb	48417beb81	Unused using directive	2017-05-20 01:22:33 -03:00
DrabWeb	615082d757	Remove whitespace	2017-05-20 01:17:04 -03:00
DrabWeb	dcc3dbf5e2	Make PlaylistItem use Paragraphs	2017-05-20 01:11:20 -03:00
DrabWeb	bfedd42ca4	Add mod tooltips	2017-05-19 23:56:48 -03:00
DrabWeb	e030573436	Add ReverseDepthFillFlowContainer to remove code duplication	2017-05-19 23:44:36 -03:00
DrabWeb	68cb23786a	Fade in background when loaded	2017-05-19 20:53:51 -03:00