798 Commits

Author	SHA1	Message	Date
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
Dean Herbert	93182e5da3	Merge branch 'master' into generic-interface	2017-05-22 09:52:40 +09:00
EVAST9919	8c1437c51a	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-21 13:44:52 +03: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
EVAST9919	9f803de9d5	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 19:49:48 +03:00
Dean Herbert	a34d9d8b09	Oops	2017-05-20 01:14:51 +09:00
Dean Herbert	9c9c0a64fd	Merge branch 'master' into debug-config-rename	2017-05-20 00:45:16 +09:00
Dan Balasescu	7e8ffe8f34	Merge branch 'master' into osd-fixes	2017-05-20 00:12:10 +09:00
Dean Herbert	528d79be51	FrameworkDebugConfig -> DebugSetting	2017-05-19 22:53:26 +09:00
Dean Herbert	0332348b24	Correctly display default audio device on OSD	2017-05-19 22:51:09 +09:00
Dean Herbert	5bcef91b89	Add padding to setting value on on screen display ... Long audio device names were destroying all padding.	2017-05-19 22:49:47 +09:00
Dean Herbert	04f7acb68a	Add setting checkbox to toggle debug logs	2017-05-19 22:47:15 +09:00
Huo Yaoyuan	ffbab6bfeb	Tidy up DrawableChannel.	2017-05-18 04:08:47 +08:00
Huo Yaoyuan	23e2d3ef07	Use GroupBy in ChatOverlay.	2017-05-18 02:40:36 +08:00
Huo Yaoyuan	b5d7211cd6	Expire placeholder text.	2017-05-18 02:40:29 +08:00
EVAST9919	a21343da23	CI fixes	2017-05-17 17:14:09 +03:00
EVAST9919	eec813ad65	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-17 17:14:00 +03:00
Dean Herbert	d606b5b3a7	Fix CI warning	2017-05-17 22:13:56 +09:00
EVAST9919	e785f1ddf1	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-17 16:12:38 +03:00
EVAST9919	fd2150aa49	Moved collectionsDropdown to it's own class	2017-05-17 15:32:16 +03:00
EVAST9919	5fb8830e3a	Moved music controller buttons to it's own class	2017-05-17 10:36:24 +03:00
Dean Herbert	231f7939a6	Fix channels being unnecessarily recycled on disconnect ... Resolves #768	2017-05-17 12:42:02 +09:00
Huo Yaoyuan	f1d5a92950	Use generic IEqutable to avoid typeless Equals.	2017-05-16 21:49:38 +08:00
Huo Yaoyuan	b9a40a841b	Use IsAssignableFrom.	2017-05-16 21:04:54 +08:00
Dan Balasescu	be3953aeb2	Merge branch 'master' into general-fixes	2017-05-16 20:52:38 +09:00
Dean Herbert	fdf0137fc2	Remove incorrect padding	2017-05-16 19:58:34 +09:00
Dean Herbert	23807aa3b9	Better handling of logged in state	2017-05-16 19:55:45 +09:00
Dean Herbert	0c7ceea4fd	Merge branch 'master' into on-screen-display	2017-05-16 18:54:54 +09:00
Dean Herbert	71b14bb8af	Merge branch 'master' into fix-duplicate-channels	2017-05-16 18:50:21 +09:00
Dean Herbert	712bd21e25	Fix duplicate channels being created on connection loss ... Resolves #763	2017-05-16 18:28:42 +09:00
Dean Herbert	3673e4af1f	Fade bold state of chat tabs better	2017-05-16 18:00:29 +09:00
Dean Herbert	0feaa407f2	Merge branch 'margin-padding-namespace' into on-screen-display	2017-05-16 16:40:06 +09:00
Dean Herbert	89e2a39d14	Merge remote-tracking branch 'upstream/master' into margin-padding-namespace	2017-05-16 16:36:34 +09:00
Dan Balasescu	91de72e161	Merge branch 'master' into on-screen-display	2017-05-16 16:27:19 +09:00
Dean Herbert	f0ea445e46	Fix initial requests of channel mesages not being performed ... fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.	2017-05-16 15:59:01 +09:00
Dan Balasescu	2ad9aa2ae5	Merge branch 'master' into chat-error-messages	2017-05-16 15:12:59 +09:00
Dean Herbert	5e5ad9a899	Add basic on-screen display	2017-05-16 15:03:03 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	3b1d5ce7df	CI fix	2017-05-15 13:31:51 +09:00
Dean Herbert	dcd4b4450d	Add error message in chat when attempting to use commands	2017-05-15 13:26:35 +09:00
Dean Herbert	1f3039926f	Reword settings text slightly	2017-05-15 12:57:55 +09:00
Dean Herbert	3b87a938db	Merge branch 'master' into cursor_size.	2017-05-15 12:23:49 +09:00