698 Commits

Author	SHA1	Message	Date
Dean Herbert	178e2b716e	Merge branch 'master' into us	2017-06-13 15:46:53 +09:00
Dean Herbert	679786c76f	Move MenuItemType to correct namespace	2017-06-13 15:20:21 +09:00
Dean Herbert	41d4aee4f5	Update nuget packages ... - [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820	2017-06-13 11:50:46 +09:00
Huo Yaoyuan	fcd137ced2	Add OsuTextFlowContainer.	2017-06-13 00:51:06 +08:00
EVAST9919	41eb084191	CI fixes	2017-06-12 13:37:13 +03:00
EVAST9919	1711258038	Context Menu	2017-06-12 12:56:07 +03:00
smoogipooo	419682b740	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework	2017-06-12 13:09:02 +09:00
Huo Yaoyuan	d5dc37ec62	Merge branch 'master' into profile	2017-06-11 23:41:08 +08:00
Krzysztof "Nairaner" Machura	e7a732068c	Fix issue where nuget was only sometimes updating modules case-sensitive	2017-06-09 12:03:18 +02:00
smoogipooo	921350128d	Rename SpeedAdjustment -> MultiplierControlPoint + reworking.	2017-06-09 16:57:17 +09:00
smoogipooo	4b2669e65d	Namespace movement.	2017-06-09 16:20:55 +09:00
smoogipooo	d11002e499	Use new naming structure + VisibleTimeRange bindable.	2017-06-09 16:11:49 +09:00
Huo Yaoyuan	283b6b2b5e	Merge branch 'master' into profile	2017-06-09 13:45:32 +08:00
smoogipooo	cd435f7ec6	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework # osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs	2017-06-09 03:37:55 +09:00
smoogipooo	1231d5d35e	More renaming + fixes.	2017-06-09 02:42:17 +09:00
smoogipooo	55f238f6a9	Remove IHasTimeSpan, add rename to TimingSection.	2017-06-08 23:40:24 +09:00
Alex Amadori	59e539f166	Fix build error on unix	2017-06-07 18:03:27 +02:00
Huo Yaoyuan	e3cdb9f6fe	Create section classes.	2017-06-07 22:53:31 +08:00
DrabWeb	8006fab3c7	Merge https://github.com/ppy/osu into osu-direct-search	2017-06-07 09:56:13 -03:00
Dean Herbert	97db4856fc	Add toolbar toggle button ... Also ensure chat is hidden when social is displayed and vice-versa.	2017-06-07 20:15:58 +09:00
Dean Herbert	6a12173175	Add very temporary data source for social browser	2017-06-07 20:05:43 +09:00
Dean Herbert	a07f6801da	Merge remote-tracking branch 'upstream/master' into timingchange-rework	2017-06-07 18:39:27 +09:00
Dean Herbert	1de296747f	Merge remote-tracking branch 'upstream/master' into social-browser	2017-06-07 17:38:06 +09:00
Dan Balasescu	eb545d907d	Merge branch 'master' into simplify-hud-overlay	2017-06-06 14:31:54 +09:00
Huo Yaoyuan	8fa076b5d7	Merge branch 'master' into userpage	2017-06-05 21:14:46 +08:00
Huo Yaoyuan	428b44f7d9	UserPage -> Profile.	2017-06-05 21:07:57 +08:00
Dean Herbert	bf971f6613	Merge branch 'master' into social-browser	2017-06-05 19:16:28 +09:00
Dean Herbert	778865b6eb	Merge remote-tracking branch 'upstream/master' into channel-selection	2017-06-05 17:36:14 +09:00
Dean Herbert	5568df1aee	Remove StandardHUDOverlay ... This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now. We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.	2017-06-05 17:18:07 +09:00
Dean Herbert	af6f8bbd89	Fix namespaces and class names	2017-06-05 16:47:42 +09:00
Dean Herbert	0cb1df35e9	Merge remote-tracking branch 'upstream/master' into ingame_options	2017-06-05 14:53:37 +09:00
smoogipooo	a3299809fe	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs	2017-06-05 10:19:53 +09:00
Dan Balasescu	d6a1205d08	Merge branch 'master' into Daycore	2017-06-05 09:33:30 +09:00
Jorolf	a43890ffb4	update osu to use the framework's TooltipContainer	2017-06-03 14:50:35 +02:00
Dan Balasescu	43f73c298f	Merge branch 'master' into timingchange-rework	2017-06-02 20:19:23 +09:00
smoogipooo	7022c8d496	Move timing change stuff to osu.Game project.	2017-06-02 20:17:44 +09:00
DrabWeb	fc6f8b9c0c	Merge https://github.com/ppy/osu into medal-splash	2017-06-01 21:19:11 -03:00
DrabWeb	212b2c1142	Initial layout and animation	2017-06-01 04:45:46 -03:00
Patrick Andersson	1dd85b5986	Add alternative for random beatmap selection ... "Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button	2017-05-31 20:11:26 +02:00
DrabWeb	9e01074852	Add GameType and DrawableGameType	2017-05-30 21:41:20 -03:00
Shawdooow	ecc0d0b11c	Daycore mod	2017-05-30 12:49:06 -04:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
DrabWeb	3aa1f35127	Basic layout	2017-05-30 05:12:11 -03:00
smoogipooo	72fa50f944	Make replay settings match design colours.	2017-05-30 17:02:04 +09:00
DrabWeb	21a8071293	Merge https://github.com/ppy/osu into channel-selection	2017-05-29 20:31:35 -03:00
Dean Herbert	5e4558cc54	Merge branch 'master' into social-browser	2017-05-29 18:35:22 +09:00
Dan Balasescu	6918368afc	Merge branch 'master' into ingame_options	2017-05-29 18:12:02 +09:00
Dean Herbert	4a0c8fb5dd	Merge branch 'master' into breadcrumbs	2017-05-29 15:59:37 +09:00
DrabWeb	8745948a01	Basic searching in osu!direct, move BeatmapSetOnlineInfo covers into their own class	2017-05-28 02:26:25 -03:00
DrabWeb	ab32e962ca	Make BeatmapOnlineInfo and BeatmapSetOnlineInfo separate classes, -OnlineWorkingBeatmap	2017-05-28 00:37:55 -03:00
Huo Yaoyuan	159e8d84c2	Move namespace and make cover background public.	2017-05-27 23:37:15 +08:00
Huo Yaoyuan	25387c996f	Merge branch 'master' into userpage	2017-05-27 22:42:56 +08:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
DrabWeb	cbe36259c3	Add BreadcrumbControl	2017-05-26 07:49:45 -03:00
smoogipooo	9517bfc2f1	Add file to csproj.	2017-05-26 19:33:23 +09:00
DrabWeb	64016f9466	Merge https://github.com/ppy/osu into channel-selection	2017-05-26 03:24:41 -03:00
DrabWeb	68377494f7	Browser - SearchableList	2017-05-26 02:44:09 -03:00
DrabWeb	8fca0fddb3	Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser	2017-05-26 00:54:03 -03:00
Huo Yaoyuan	9bc1eece0a	Basic section management of userpage.	2017-05-25 02:11:07 +08:00
Seth	3094a8267f	Merge branch 'master' into drawable-multiplayer-room	2017-05-24 04:39:57 -03:00
Dean Herbert	3134f92051	Merge branch 'master' into user-panel	2017-05-24 16:32:09 +09:00
DrabWeb	ba2627d4e2	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-24 02:40:00 -03:00
DrabWeb	4490596f5f	Keep one object per file	2017-05-24 02:37:27 -03:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
ColdVolcano	c6d744eb7c	Merge branch 'master' of ppy/osu into menu-flashes	2017-05-23 20:00:02 -05:00
EVAST9919	2ca0794b37	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-23 14:45:38 +03:00
Dean Herbert	0634a3a5c5	Merge branch 'master' into osu-direct	2017-05-23 17:33:20 +09:00
smoogipooo	3cdfd2eef5	Split ControlPoint into different types. ... # Conflicts: # osu.Game.Rulesets.Mania/UI/Column.cs	2017-05-23 14:03:40 +09:00
Dean Herbert	1295b0a7e1	Merge branch 'master' into ColdVolcano/beat-syncing	2017-05-23 10:51:47 +09:00
DrabWeb	9798117d53	Move RoomStatus to a class instead of enum	2017-05-22 21:13:57 -03:00
DrabWeb	03f6cded84	MultiplayerRoom -> Room	2017-05-22 12:44:58 -03:00
ColdVolcano	a1547f12d4	Applied suggestions + Update Framework	2017-05-22 04:38:21 -05:00
smoogipooo	3235e280a9	Add to csproj.	2017-05-22 17:32:18 +09:00
EVAST9919	b99bad055d	oops	2017-05-22 09:28:36 +03:00
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
DrabWeb	7ce3b73ecd	Added UserPanel and UserStatus	2017-05-22 03:11:42 -03:00
EVAST9919	d717ccf85e	Settings -> ReplaySettings	2017-05-22 09:07:08 +03:00
Huo Yaoyuan	d0ff9e6576	Merge branch 'master' into sections	2017-05-22 12:52:27 +08:00
DrabWeb	800a319470	Remove newline	2017-05-22 01:08:35 -03:00
DrabWeb	0c30b2c698	Remove folder from osu.Game.csproj	2017-05-22 01:07:26 -03:00
DrabWeb	0795089d86	Merge https://github.com/ppy/osu into drawable-multiplayer-room	2017-05-22 01:06:05 -03:00
DrabWeb	e5ee7096f8	Initial cleanup	2017-05-22 00:07:15 -03:00
DrabWeb	c4e6870c12	Merge https://github.com/ppy/osu into roompanel	2017-05-21 22:37:00 -03:00
DrabWeb	bc980b60ac	Add files to project, update with framework changes	2017-05-21 22:36:46 -03:00
smoogipooo	0a0139aded	Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.	2017-05-22 10:12:33 +09:00
Jorolf	5b244367ee	allow for solutions were the osu repository isn't at the solution level	2017-05-21 20:29:05 +02:00
EVAST9919	0615f104f0	SettingsContainer -> SettingsDropdownContainer	2017-05-21 18:22:27 +03:00
DrabWeb	6a8d745db1	Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned	2017-05-20 18:29:57 -03:00
DrabWeb	31890a1e01	Initial layout, channels items	2017-05-20 18:06:25 -03:00
Dean Herbert	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
DrabWeb	e030573436	Add ReverseDepthFillFlowContainer to remove code duplication	2017-05-19 23:44:36 -03:00
DrabWeb	cdd2b54dc7	Move SlimEnumDropdown into it's own file	2017-05-19 20:25:08 -03:00
DrabWeb	83c81c0626	Cleanup (again)	2017-05-19 20:03:07 -03:00
Huo Yaoyuan	24a813e907	Basic children management of SectionsContainer.	2017-05-20 05:15:57 +08:00
DrabWeb	5b2c74be50	Remove Direct folder from csproj	2017-05-19 16:24:27 -03:00
DrabWeb	e1c4c36122	+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds	2017-05-19 15:43:18 -03:00
EVAST9919	4d0d27aa88	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 15:25:48 +03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
EVAST9919	d07d94d606	better resizing	2017-05-18 07:09:36 +03:00
EVAST9919	35bc3a42aa	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 06:36:15 +03:00
smoogipooo	eebd5a910e	Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion	2017-05-18 11:59:31 +09:00
DrabWeb	cabfe72c92	Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel	2017-05-17 18:02:33 -03:00
DrabWeb	5fb445e3fe	Basic direct panel, minor cleanups	2017-05-17 16:37:34 -03:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
EVAST9919	e0625a9b30	More overlays and overall fixes	2017-05-17 15:39:26 +03:00
smoogipooo	74c23ff6d8	Add base for event parsing code.	2017-05-17 20:46:23 +09:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
EVAST9919	1a4025ab3c	ingame options basic logic	2017-05-17 10:36:57 +03:00
smoogipooo	17466a662c	Add hold note conversion.	2017-05-17 13:09:07 +09:00
Dan Balasescu	91de72e161	Merge branch 'master' into on-screen-display	2017-05-16 16:27:19 +09:00
Dean Herbert	5e5ad9a899	Add basic on-screen display	2017-05-16 15:03:03 +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	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
Dan Balasescu	815379646c	Merge branch 'master' into new-option-search	2017-05-12 20:22:11 +09:00
Dean Herbert	d3770d8395	Merge branch 'master' into chat-design-update	2017-05-12 19:57:57 +09:00
Dean Herbert	d2e066ca35	Move SearchTextBox to better namespace ... Is being used in multiple places now.	2017-05-12 19:57:06 +09:00
Dean Herbert	dbf60d24bf	Second design update pass.	2017-05-12 15:39:00 +09:00
Dean Herbert	c4a93cbc85	Move drawable chat related classes to better namespace	2017-05-12 15:38:51 +09:00
EVAST9919	1f34cec5ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-11 22:22:57 +03:00
Dean Herbert	9a1c662d1f	Update framework	2017-05-11 21:25:43 +09:00
Dean Herbert	ec67b617ae	Add OptionsHeader class ... Makes search textbox anchor correctly. Also improves visual styling.	2017-05-11 16:06:18 +09:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03:00
Dean Herbert	df4a737c9b	Merge remote-tracking branch 'ppy/master' into hud-mod-display	2017-05-08 10:56:34 +09:00
EVAST9919	d06b5783cb	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-06 17:33:51 +03:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
Dean Herbert	6298b3effd	Refactor ModSection and ModIcon to avoid null mods.	2017-05-05 12:16:41 +09:00
Dean Herbert	153951d3dd	Add OptionItem class ... Allow for centalised logic for all option UI controls.	2017-05-04 23:07:48 +09:00
EVAST9919	26985dbc62	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 16:22:40 +03:00
Dean Herbert	19f6d58723	Merge remote-tracking branch 'upstream/master' into options-implementation	2017-05-03 21:54:27 +09:00
EVAST9919	f49cc124ed	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 08:26:54 +03:00
EVAST9919	a897dcbfbe	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-03 08:26:01 +03:00
EVAST9919	7e1efcc20b	Added ModsContainer	2017-05-02 22:34:07 +03:00
Dean Herbert	691742b828	Remove most options which have not yet been implemented.	2017-05-02 19:40:30 +09:00
smoogipooo	8e88d86639	Fix naming confusion.	2017-05-02 18:00:37 +09:00
Dean Herbert	1b0f353af3	Add support for framework-level mouse confining.	2017-05-02 17:45:42 +09:00
Dean Herbert	bef15fe637	Improve organisation of some options and config code.	2017-05-02 17:45:22 +09:00
EVAST9919	108cd28e96	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-02 10:15:56 +03:00
smoogipooo	e856abe59a	Let's not use Country for drawings-specific stuff...	2017-05-02 13:02:14 +09:00
Dean Herbert	2e0eda6b15	Merge branch 'master' into playlist	2017-05-01 19:44:57 +09:00
Dean Herbert	580cf93147	Refactoring part 4.	2017-05-01 15:03:11 +09:00
Dean Herbert	37944bb04e	Initial refactoring.	2017-05-01 13:01:08 +09:00
DrabWeb	c193a90a16	Merge https://github.com/ppy/osu into playlist	2017-04-29 05:39:52 -03:00
Thomas Tan	9b8b88601f	Create "AutoGenerator" base class and interface.	2017-04-29 02:08:48 +08:00
EVAST9919	eacf2045f0	Initial commit	2017-04-28 04:56:34 +03:00
smoogipooo	28f7e0cdba	Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.	2017-04-26 14:12:21 +09:00
Dan Balasescu	91b264da1a	Merge branch 'master' into info-wedge-design-update	2017-04-25 08:14:59 +09:00
Dean Herbert	c7b789424b	Update BeatmapInfoWedge design ... - Adds colour difficulty strip. - Adjusts paddings. - Fixes source/artist confusion. - Double dash to em-dash.	2017-04-24 20:19:44 +09:00
Dean Herbert	e1a2f1bc7a	Add beatmap metrics lookup.	2017-04-24 19:17:11 +09:00
Dean Herbert	239f19ad02	Fix incorrect line endings.	2017-04-24 14:10:44 +09:00