9790 Commits

Author	SHA1	Message	Date
smoogipoo	f9f300b215	Fix drag breaking if scrolling while dragging	2018-11-26 16:08:56 +09:00
Dean Herbert	fe5b043a59	Merge branch 'master' into fix_idle_tracker	2018-11-26 15:24:44 +09:00
Dean Herbert	4cfeb1b9a1	Merge branch 'master' into note-placement	2018-11-26 14:35:31 +09:00
Dean Herbert	c944e8bb29	Merge branch 'master' into fix-deletion-crash	2018-11-26 14:20:02 +09:00
Dean Herbert	bfebed053d	Merge branch 'master' into note-placement	2018-11-26 14:19:46 +09:00
smoogipoo	56032a4522	Merge branch 'mania-selection-movement' into inter-column-movements ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs # osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs	2018-11-26 11:45:48 +09:00
smoogipoo	4fbe28e98f	Merge remote-tracking branch 'origin/master' into note-placement	2018-11-26 10:42:20 +09:00
naoey	c71fc0b800	Don't focus overlay again after set is fetched	2018-11-25 14:49:09 +05:30
smoogipoo	cadfe41f83	Merge remote-tracking branch 'origin/master' into external_link_warning	2018-11-23 15:19:52 +09:00
smoogipoo	df004d7a49	Adjust dialog text	2018-11-23 15:19:15 +09:00
smoogipoo	ac73844fe0	Fix header potentially overflowing the dialog	2018-11-23 15:19:09 +09:00
Dean Herbert	afa547af84	Fix order of ChannelManager dependency caching	2018-11-23 11:00:17 +09:00
Dan Balasescu	b446a73c0c	Add brackets ... Co-Authored-By: peppy <pe@ppy.sh>	2018-11-23 10:06:06 +09:00
Dean Herbert	1b76e2faf5	Merge branch 'master' into fix-editor-precise-scroll	2018-11-23 09:57:35 +09:00
Dean Herbert	a4259261e3	Merge branch 'master' into fix-channel-presence	2018-11-23 08:11:46 +09:00
Dan Balasescu	2f368a32d4	Merge branch 'master' into fix-invalid-cached	2018-11-22 23:56:20 +09:00
Dan Balasescu	0ee4b1c4ac	Merge branch 'master' into fix-channel-presence	2018-11-22 21:52:16 +09:00
Dean Herbert	10047e6815	Adjust tick-based wheel control to be more correct	2018-11-22 20:13:40 +09:00
Dean Herbert	1da2006dea	Merge branch 'master' into note-placement	2018-11-22 19:44:39 +09:00
Dean Herbert	a48c26d999	Fix precision scroll events being handled incorrectly by editor	2018-11-22 19:40:44 +09:00
Dean Herbert	61fdfe39fd	Add comment	2018-11-22 19:21:32 +09:00
Dean Herbert	6cd69b794d	Fix leaderboard accessing drawables in a possibly invalid state	2018-11-22 19:08:46 +09:00
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
smoogipoo	5caa67d735	Hide playlist when MusicController is hidden	2018-11-22 12:12:34 +09:00
miterosan	4f41512265	Lowercase the references to joinedChannel and availableChannels	2018-11-21 23:21:27 +01:00
miterosan	21c9353fee	Remove not used usings	2018-11-21 23:15:45 +01:00
miterosan	a14b6ac9df	Replace ObservableCollection with BindableCollection	2018-11-21 23:15:44 +01:00
smoogipoo	cd2737156f	Fix crashes when importing/deleting from model managers	2018-11-21 23:11:09 +01:00
smoogipoo	aac7081580	Update package	2018-11-21 23:11:09 +01:00
smoogipoo	39e9c61e24	OpenTK -> osuTK	2018-11-21 23:11:08 +01: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	dc8cd51e15	Implement mania note deletion	2018-11-20 17:26:00 +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
Roman Kapustin	285b199d7d	Make IdleTracker IHandleGlobalInput	2018-11-19 20:50:46 +03:00
Roman Kapustin	3c0ce2b615	Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"" ... This reverts commit bcdaee7d395f56c47dd67f6fc517edf4463daa4d.	2018-11-19 20:48:59 +03:00
smoogipoo	d5b937f88f	Fix post-merge issue	2018-11-19 19:17:03 +09:00
Dan Balasescu	8cee4141e8	Merge branch 'master' into note-placement	2018-11-19 19:08:53 +09:00