2682 Commits

Author	SHA1	Message	Date
smoogipoo	d93421b796	Merge remote-tracking branch 'Joehuu/master' into timeshift-wip ... # Conflicts: # osu.Game/Screens/Play/HUD/ModDisplay.cs	2018-12-22 14:02:45 +09:00
smoogipoo	5d59a1ffca	Merge remote-tracking branch 'origin/master' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCasePollingComponent.cs # osu.Game/Online/API/APIRequest.cs # osu.Game/osu.Game.csproj	2018-12-21 12:51:31 +09:00
Dean Herbert	aaac45ab8c	Add ability to select chat tabs with alt-1-9	2018-12-20 21:50:47 +09:00
smoogipoo	104a3c8ffc	Add click to avatar	2018-12-20 20:08:22 +09:00
Styphix	bacc07f5ec	Changed OsuFocusedOverlayContainer to WaveOverlayContainer from ChannelSelectionOverlay ... Not sure what colour i shouldve gone for but im certain that this should be fine	2018-12-18 19:44:31 -05:00
Dean Herbert	0b5f3c00bf	Revert "Fix WaveOverlayContainer always being present" ... This reverts commit a6fc128094.	2018-12-14 20:50:27 +09:00
smoogipoo	d9fc7c7d66	Separate out Leaderboard into BeatmapLeaderboard	2018-12-14 19:51:27 +09:00
Dean Herbert	a6fc128094	Fix WaveOverlayContainer always being present	2018-12-14 15:41:05 +09:00
smoogipoo	2aafaf9ce2	Merge branch 'timeshift-api-integration'	2018-12-13 17:07:39 +09:00
smoogipoo	208273f16a	Merge branch 'timeshift' ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-13 17:06:20 +09:00
Dean Herbert	4fc9902cd2	Fix reverting to default skin via settings button causing a hard crash	2018-12-12 21:30:21 +09:00
smoogipoo	450e4cd223	Hook up API	2018-12-12 19:04:11 +09:00
smoogipoo	9af2b49c01	Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-12 16:22:14 +09:00
smoogipoo	41c7d10dff	Fix compilation issues (+ use updated framework)	2018-12-10 13:48:05 +09:00
Dean Herbert	2a2561e5c8	Update framework and otehr nuget packages	2018-12-07 19:39:54 +09:00
Dean Herbert	2122966cd4	Show channel selector when no channels are joined	2018-12-07 13:26:31 +09:00
Dan Balasescu	78d1a1c499	Merge branch 'master' into fix-async-profile-logic	2018-12-03 20:55:23 +09:00
Dan Balasescu	f278dff49c	Merge branch 'master' into fix-chat-crash	2018-12-03 19:17:05 +09:00
Dean Herbert	7e35afd178	Fix loading scores on profile pages potentially causing long blocking operations	2018-12-03 18:37:44 +09:00
Dean Herbert	14d9f1d8bb	Fix hard crash due to out-of-order chat sequencing	2018-12-03 18:13:10 +09:00
smoogipoo	814d401eb0	Make ChannelSelectorTabItem not switchable	2018-12-03 11:48:36 +09:00
smoogipoo	7255a01bf5	Remove ChatTabControl	2018-12-03 11:48:21 +09:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
Dean Herbert	059e9e180b	Apply review	2018-11-30 18:07:15 +09:00
Dean Herbert	3727955911	Refactors/renames	2018-11-30 16:35:45 +09:00
Dean Herbert	831cd3ed59	ScoreInfo scoreInfo -> ScoreInfo score	2018-11-30 15:18:52 +09:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
smoogipoo	219929eb47	Score -> ScoreInfo	2018-11-28 18:33:01 +09:00
smoogipoo	5b409a5ae5	Fix missed renames	2018-11-28 17:27:22 +09:00
smoogipoo	09b79d736b	Remove unused usings	2018-11-28 16:33:42 +09:00
smoogipoo	5fd6e6ca77	Re-namespacing	2018-11-28 16:12:57 +09:00
Dean Herbert	6647fcd299	Fix volume adjustment precision regressing	2018-11-27 18:05:38 +09:00
smoogipoo	efdad3a3a7	Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection	2018-11-26 16:12:55 +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	1b76e2faf5	Merge branch 'master' into fix-editor-precise-scroll	2018-11-23 09:57:35 +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	61fdfe39fd	Add comment	2018-11-22 19:21:32 +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	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	39e9c61e24	OpenTK -> osuTK	2018-11-21 23:11:08 +01:00
Dean Herbert	7755242a43	Merge branch 'master' into osuTK	2018-11-21 18:53:11 +09:00
Dean Herbert	eab2776755	Fix a crash on leaving the selected channel	2018-11-21 17:15:15 +09:00
smoogipoo	5ad96afea0	Fix crashes when importing/deleting from model managers	2018-11-20 18:09:23 +09:00