9555 Commits

Author	SHA1	Message	Date
Dean Herbert	a144e97568	Fix crash on creating two new PM channels	2018-11-22 18:27:22 +09:00
smoogipoo	d1ec9fc294	Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence	2018-11-22 13:04:32 +09:00
Dean Herbert	2126cf0d9a	Fix join process for PMs being incorrect	2018-11-21 20:44:41 +09:00
Dean Herbert	b31efb7bb9	Fix PM channel type	2018-11-21 20:34:36 +09:00
Dean Herbert	d677921680	Remove excess newline	2018-11-21 18:53:50 +09:00
Dean Herbert	7755242a43	Merge branch 'master' into osuTK	2018-11-21 18:53:11 +09:00
Dean Herbert	ecd7deaf1e	Merge pull request #3746 from smoogipoo/fix-threaded-callback-crashes ... Fix crashes when importing/deleting from model managers	2018-11-21 18:52:20 +09:00
Dean Herbert	88f82eb722	Fix instabilities in channel join logic	2018-11-21 17:15:15 +09:00
Dean Herbert	4cde66240d	Fix default channels not being joined	2018-11-21 17:15:15 +09:00
Dean Herbert	eab2776755	Fix a crash on leaving the selected channel	2018-11-21 17:15:15 +09:00
smoogipoo	ab2c969122	Add private channel types	2018-11-21 12:58:45 +09:00
smoogipoo	5ad96afea0	Fix crashes when importing/deleting from model managers	2018-11-20 18:09:23 +09:00
smoogipoo	2a41c38294	Update package	2018-11-20 17:30:03 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Dean Herbert	23a446bab2	Add support for all channel types	2018-11-20 15:03:55 +09:00
Dean Herbert	ed26d8ebec	Merge branch 'master' into fix-taiko-lifetimes	2018-11-20 04:05:05 +09:00
smoogipoo	bcdaee7d39	Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle" ... This reverts commit 3e2e2a7000, reversing changes made to d94801b6c6.	2018-11-19 17:52:31 +09:00
Dean Herbert	970ea928ae	Fix hold for menu button occasionally disappearing	2018-11-19 12:06:47 +09:00
Dean Herbert	a57f98ed4d	Merge branch 'master' into fix-taiko-lifetimes	2018-11-19 08:41:19 +09:00
Dean Herbert	72c9c66461	Merge branch 'master' into improve_hud_overlay_colour_setting	2018-11-19 08:14:51 +09:00
Roman Kapustin	ecf8a89f26	Set AccentColour and GlowColour in StandardHealthDisplay	2018-11-16 19:30:58 +03:00
Dan Balasescu	57c1ddb1e0	Merge branch 'master' into flashlight-mod	2018-11-16 18:45:15 +09:00
Roman Kapustin	37b19f78ae	Set AccentColour in concrete counters	2018-11-15 23:37:21 +03:00
jorolf	80bd98bb9d	apply suggestions	2018-11-15 17:38:38 +01:00
smoogipoo	e207dd728b	Fix taiko proxies not receiving the correct lifetimes	2018-11-15 20:26:12 +09:00
Dan Balasescu	e8f34ddff0	Merge branch 'master' into return_to_large_logo_after_idle	2018-11-15 15:16:10 +09:00
jorolf	41a0f9896e	Merge branch 'master' into flashlight-mod	2018-11-15 00:35:42 +01:00
jorolf	7d2958b7b0	split shader, remove unnecessary clutter and fix some bugs	2018-11-15 00:33:13 +01:00
HoLLy	9dd3d28436	Fix SettingsTextBox having width of 0	2018-11-14 22:29:11 +01:00
Dean Herbert	caaa5645e3	Correct framework version	2018-11-14 21:16:08 +09:00
Dean Herbert	30547ac064	Merge remote-tracking branch 'upstream/master' into dropdown-updates	2018-11-14 20:03:45 +09:00
smoogipoo	f1f2fc133a	Use SkinInfo directly	2018-11-14 19:29:20 +09:00
Dan Balasescu	81a3170e3b	Merge branch 'master' into hold-for-menu-back	2018-11-14 19:13:07 +09:00
Dan Balasescu	61a62a4eae	Merge branch 'master' into hold-for-menu-back	2018-11-14 18:35:08 +09:00
smoogipoo	4b86c29f7b	Merge remote-tracking branch 'origin/master' into placement-hiding	2018-11-14 18:34:45 +09:00
smoogipoo	c963fc7cd2	Reduce chaining	2018-11-14 18:34:13 +09:00
Dan Balasescu	e9b47c6233	Merge branch 'master' into hold-for-menu-back	2018-11-14 18:22:34 +09:00
Dean Herbert	a83efe225e	Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase	2018-11-14 18:11:53 +09:00
smoogipoo	aff5fa6169	Update with osu!-side dropdown changes	2018-11-14 18:02:38 +09:00
Dean Herbert	a1dd1057ce	Merge branch 'master' into more-global-scrollalgo	2018-11-14 17:15:24 +09:00
Dean Herbert	84d16ee71b	Merge branch 'master' into placement-hiding	2018-11-14 16:59:41 +09:00
smoogipoo	7274908059	Implement interface	2018-11-14 15:33:09 +09:00
Dean Herbert	fb22fc11f6	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-11-14 13:59:17 +09:00
Dean Herbert	9a9d5e60af	More refactors	2018-11-14 13:59:02 +09:00
Dean Herbert	2ae139d260	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:54:53 +09:00
Dean Herbert	34973a3e9f	Merge branch 'master' into scrollalgorithm-timeat	2018-11-14 13:32:16 +09:00
Dean Herbert	8b190edde0	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:32:14 +09:00
Dean Herbert	8d59b7299f	Merge branch 'master' into no-drawable-speedchangevis	2018-11-14 13:22:01 +09:00
Dean Herbert	c4769f6802	Refactors	2018-11-14 13:19:51 +09:00
Dean Herbert	396a5b3cd0	Merge branch 'master' into Private_Messages	2018-11-14 12:49:54 +09:00