9749 Commits

Author	SHA1	Message	Date
Dean Herbert	626048038c	Handle the null case	2018-11-26 16:50:41 +09:00
Dan Balasescu	38ef1d1f03	Merge branch 'master' into multiplayer-room-settings	2018-11-26 16:46:27 +09:00
Dean Herbert	b751a0d918	Merge branch 'master' into fix_idle_tracker	2018-11-26 16:44:04 +09:00
Dean Herbert	87da7b05a6	Remove unnecessarily specified RelativeSizeAxes	2018-11-26 16:39:11 +09:00
Dean Herbert	68f0d25550	Mvoe private method to bottom	2018-11-26 16:33:58 +09:00
Dean Herbert	8d65d49126	Use bindable flow for checking idle time	2018-11-26 16:32:59 +09:00
smoogipoo	dea387c31e	Fix post-merge issues	2018-11-26 16:29:56 +09:00
smoogipoo	dcf740e5d3	Merge remote-tracking branch 'origin/master' into multiplayer-room-settings	2018-11-26 16:27:22 +09:00
smoogipoo	efdad3a3a7	Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection	2018-11-26 16:12:55 +09:00
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 bcdaee7d39.	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
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
smoogipoo	55edeb095d	SelectionBox -> SelectionHandler	2018-11-19 16:58:11 +09:00
smoogipoo	595e2ffbff	Unbind event when column changes	2018-11-19 16:20:21 +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	376e76e00d	Resolve merge conflicts	2018-11-18 16:10:36 +03: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
smoogipoo	4cbda97b1e	Move positional adjustment to SelectionBox	2018-11-16 17:12:24 +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	df7515b66f	Pass all selected hitobjects to the selection blueprints	2018-11-15 21:01:09 +09:00
smoogipoo	d5464702fa	Fix post-merge issue	2018-11-15 20:56:34 +09:00
smoogipoo	eddba44d0f	Merge branch 'note-placement' into inter-column-movements	2018-11-15 20:53:57 +09: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
Jack Scotson	8ee81c4811	Merge branch 'master' into keypad-enter	2018-11-14 10:03:19 +00: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
Dean Herbert	4dec2d1db0	Merge remote-tracking branch 'upstream/master' into note-placement	2018-11-14 18:29:31 +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
Dean Herbert	b9278b3488	Fix brackets	2018-11-14 12:05:07 +09:00
Dean Herbert	161d476091	Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song	2018-11-14 11:53:43 +09:00
Dean Herbert	c77412992e	Merge conditionals	2018-11-14 11:53:34 +09:00
Jack Scotson	0bced171e7	Merge branch 'master' into keypad-enter	2018-11-13 17:11:21 +00:00
Scotsoo	4dab5db2e5	Allowing keypad enter to be used along with normal enter	2018-11-13 17:09:28 +00:00
Dean Herbert	3caf0cb0d9	Merge branch 'master' into no-drawable-speedchangevis	2018-11-13 19:42:04 +09:00
Dean Herbert	e7d984415b	Merge branch 'master' into immutable-sliderpath	2018-11-13 18:06:14 +09:00
Dean Herbert	72ae22b0c4	Add support for creating new PM conversations	2018-11-13 17:24:11 +09:00
Dean Herbert	f241fcdba1	Add back support for new API and private messages	2018-11-13 15:20:59 +09:00
smoogipoo	6d43baf4bf	Make show/hide only invoked once each	2018-11-13 13:12:11 +09:00
smoogipoo	fbc20d2d4d	Hide placement when cursor is not in the playfield	2018-11-13 12:52:04 +09:00
Dean Herbert	8b9f7f6691	Merge branch 'master' into Private_Messages	2018-11-12 20:43:10 +09:00
Dean Herbert	4b1282235a	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-11-12 20:41:10 +09:00
smoogipoo	3d8ef97e81	Add testcase	2018-11-12 19:41:06 +09:00
smoogipoo	3a1fee59fb	Implement note placement	2018-11-12 18:24:18 +09:00
smoogipoo	a0c75a0597	Merge branch 'notepieces' into note-placement	2018-11-12 17:59:54 +09:00
smoogipoo	9e1b54f1ef	Merge branch 'more-global-scrollalgo' into note-placement	2018-11-12 17:47:02 +09:00
smoogipoo	b9b20607af	Add IScrollAlgorithm.TimeAt()	2018-11-12 17:43:22 +09:00
smoogipoo	2e0e1befe9	Add selection mask testcases ... # Conflicts: # osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs	2018-11-12 17:40:09 +09:00
smoogipoo	8be6e351f5	Merge branch 'fix-mania-selections' into add-mania-selection-testcase	2018-11-12 17:39:58 +09:00
smoogipoo	d8e7ad8241	Fix post-rebase issues	2018-11-12 17:36:19 +09:00
smoogipoo	10543cf1b6	Move rest of ScrollingPlayfield into ScrollingRulesetContainer	2018-11-12 17:34:35 +09:00
smoogipoo	e7969ecec7	Move ScrollAlgorithm inside IScrollingInfo	2018-11-12 17:34:35 +09:00
smoogipoo	54668a0dec	Simplify construction of ScrollingInfo	2018-11-12 17:34:35 +09:00
smoogipoo	ad45bc7666	Move scroll direction to scrollinginfo	2018-11-12 17:34:35 +09:00
smoogipoo	48486895ba	Remove unused code	2018-11-12 17:34:35 +09:00
smoogipoo	9fde7f7f44	Move scrolling info to osu.Game	2018-11-12 17:34:35 +09:00
smoogipoo	7f0f143a1b	Move IScrollAlgorithm to ScrollingRulesetContainer + use DI	2018-11-12 17:34:35 +09:00
smoogipoo	aee7a80e71	ScrollAlgorithm -> ScrollVisualisationMethod	2018-11-12 17:26:37 +09:00
smoogipoo	f3ba429701	Make sure control points is internally initialised	2018-11-12 17:14:06 +09:00
Dean Herbert	1101e161d9	Update framework and resources	2018-11-12 17:02:46 +09:00
smoogipoo	f4fd6189f8	Implement IEquatable	2018-11-12 16:53:30 +09:00
smoogipoo	0220ed21b0	Ignore distance for json serialisation	2018-11-12 16:38:49 +09:00
smoogipoo	0e92b385f0	Define default json deserialisation constructor	2018-11-12 16:38:33 +09:00
smoogipoo	8ad9b6a02a	Safety for default(SliderPath)	2018-11-12 16:38:14 +09:00
smoogipoo	d594ce3530	Revert "Make SliderPath.ControlPoints read-only" ... This reverts commit 3b88d94793. # Conflicts: # osu.Game/Rulesets/Objects/SliderPath.cs	2018-11-12 16:20:38 +09:00
smoogipoo	77d16aa968	Add xmldocs	2018-11-12 14:16:21 +09:00
smoogipoo	4eef1134a6	Re-order file	2018-11-12 14:08:36 +09:00
smoogipoo	3aba462e52	Make Path.Distance a property again	2018-11-12 14:07:48 +09:00
smoogipoo	3b88d94793	Make SliderPath.ControlPoints read-only	2018-11-12 14:03:54 +09:00
smoogipoo	54ab256c8e	Instantiate a new path rather than setting properties on it ... # Conflicts: # osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs # osu.Game.Rulesets.Catch/Objects/JuiceStream.cs # osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/SliderPath.cs	2018-11-12 13:50:19 +09:00
jorolf	023924396d	Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time	2018-11-11 18:38:12 +01:00
Dean Herbert	4783df1d4b	Fix compose mode not working	2018-11-09 11:36:06 +09:00
Dean Herbert	27549586e6	Merge branch 'master' into manual-position-adjustments	2018-11-09 10:53:41 +09:00
smoogipoo	33056b8098	Adjust namespaces	2018-11-08 14:04:21 +09:00
smoogipoo	f66a9f4f1e	Rename IScrollChangeVisualiser -> IScrollAlgorithm	2018-11-08 14:04:21 +09:00
smoogipoo	2f87f267a3	Fix height being set instead of width	2018-11-08 14:04:20 +09:00
smoogipoo	195f82fa96	Give visualiser methods range+length params again	2018-11-08 14:04:20 +09:00