930 Commits

Author	SHA1	Message	Date
Dean Herbert	0cb1df35e9	Merge remote-tracking branch 'upstream/master' into ingame_options	2017-06-05 14:53:37 +09:00
Dan Balasescu	6bda62f260	Merge branch 'master' into async-channel-load	2017-06-05 10:02:01 +09:00
Jorolf	a43890ffb4	update osu to use the framework's TooltipContainer	2017-06-03 14:50:35 +02:00
Dean Herbert	5b80c8ac49	Load initial channel content asynchronously ... Quite often, the first time loading a chat channel will be loading font characters (textures) that were previously never displayed. This stops the game from stuttering in such a scenario.	2017-06-01 18:29:34 +09:00
Patrick Andersson	1dd85b5986	Add alternative for random beatmap selection ... "Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button	2017-05-31 20:11:26 +02: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
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
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
EVAST9919	261f1f4e1f	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-29 18:13:44 +03: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
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
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
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