818 Commits

Author	SHA1	Message	Date
Huo Yaoyuan	18295a9b97	Handle scrolling in SectionsContainer.	2017-06-25 10:06:54 +08:00
MrTheMake	cc71c10488	Merge branch 'master' into musiccontroller-canbeatmapchange	2017-06-24 12:26:40 +02:00
Thomas Müller	e3489928b7	Remove now obsolete InternalContains	2017-06-24 09:21:08 +02:00
Thomas Müller	f5829860a2	Get rid of AlwaysReceiveInput	2017-06-23 18:02:24 +02:00
Dean Herbert	b90c9bcacf	Merge branch 'master' into profile	2017-06-23 22:51:31 +09:00
Dean Herbert	a0e7751cd1	Merge branch 'master' into fix-invalid-depth	2017-06-23 14:48:12 +09:00
Dean Herbert	5dc0b87ef5	Apply some fixes for my own comments	2017-06-23 14:02:19 +09:00
MrTheMake	8b07565025	Added test case usability, namings and bug fixes	2017-06-21 16:33:26 +02:00
MrTheMake	67292a5dcf	Brought ITransform in line with framework changes	2017-06-21 12:27:45 +02:00
Marco Stephan	8ffd7b313b	Merge branch 'master' into musiccontroller-canbeatmapchange	2017-06-21 12:23:38 +02:00
MrTheMake	7a9d430a28	Applied suggested changes	2017-06-21 12:17:59 +02:00
Dean Herbert	89986e8e77	Fix namespaces	2017-06-21 17:03:47 +09:00
Dean Herbert	45d3c2cd52	Merge branch 'master' into profile	2017-06-21 16:40:17 +09:00
smoogipooo	b191d96aab	CI fixes.	2017-06-21 11:35:19 +09:00
smoogipooo	fc0e44b214	Update framework.	2017-06-21 11:28:27 +09:00
MrTheMake	2db0466722	Readded color flash and simplify logic	2017-06-21 02:47:11 +02:00
MrTheMake	edd7fd585c	Disable beatmap changing buttons when entering a screen that disallows changing the beatmap	2017-06-21 00:51:32 +02:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
smoogipooo	1d5c5a0a4d	Fix an invalid depth operation.	2017-06-19 07:50:26 +09:00
Huo Yaoyuan	af4ddf8fbd	Merge branch 'master' into profile.	2017-06-16 16:32:54 +08:00
Dean Herbert	f2cac17188	Merge branch 'master' into timingchange-rework	2017-06-16 17:04:43 +09:00
Huo Yaoyuan	fa98cfa9e5	Handle max==min in LineGraph.	2017-06-16 14:48:14 +08:00
Dean Herbert	ae79ba48be	Merge branch 'master' into numpad-enter	2017-06-16 15:32:52 +09:00
MrTheMake	06089a74e3	Handle the numpad's Enter in cases where only the normal Enter was handled	2017-06-15 23:06:28 +02:00
Huo Yaoyuan	3ec5d774df	Child control fixes.	2017-06-15 22:42:15 +08:00
Dan Balasescu	6fd37ebc32	Merge branch 'master' into timingchange-rework	2017-06-15 16:23:51 +09:00
Huo Yaoyuan	1d85578bf5	Fix license header.	2017-06-15 07:29:32 +08:00
Huo Yaoyuan	ce67a28609	Merge branch 'master' into profile.	2017-06-15 02:31:51 +08:00
Huo Yaoyuan	78669a5941	Hover for rank history.	2017-06-15 02:17:48 +08:00
Huo Yaoyuan	3b64dfe0fd	Update transform using masking.	2017-06-15 00:46:39 +08:00
Huo Yaoyuan	443e24716c	Handle relative size at LineGraph level.	2017-06-14 22:00:22 +08:00
Huo Yaoyuan	190de76d9a	Add LineGraph.	2017-06-14 20:37:07 +08:00
smoogipooo	99a93d98dc	Merge remote-tracking branch 'origin/master' into fix-hacky-tabs	2017-06-13 19:46:01 +09:00
Huo Yaoyuan	9ceb4930e9	Merge branch 'master' into profile	2017-06-13 15:23:12 +08:00
Dean Herbert	19236dcd1e	Merge branch 'improved-loading-animation' into nuget-update	2017-06-13 15:50:21 +09:00
Dean Herbert	700d6f9d38	Adjust appearance slightly	2017-06-13 15:27:47 +09:00
Dean Herbert	679786c76f	Move MenuItemType to correct namespace	2017-06-13 15:20:21 +09:00
Huo Yaoyuan	755d2737d0	Improve OsuTextFlowContainer with framework.	2017-06-13 02:58:10 +08:00
Huo Yaoyuan	c75e2909ee	Expose AddTextAwesome for OsuTextFlowContainer.	2017-06-13 00:58:32 +08:00
Huo Yaoyuan	fcd137ced2	Add OsuTextFlowContainer.	2017-06-13 00:51:06 +08:00
EVAST9919	9f8c66b8c6	Forgot to add dropdown-like animation	2017-06-12 13:39:45 +03: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
Dean Herbert	3efe8629d6	Fix hacky tabs	2017-06-12 18:39:22 +09:00
Dean Herbert	e94425f311	Improve the loading animation and use it in multiple places ... - Supersedes https://github.com/ppy/osu/pull/926. - [ ] Depends on https://github.com/ppy/osu-framework/pull/817.	2017-06-12 17:04:42 +09:00
Huo Yaoyuan	e311ac612c	Merge branch 'master' into profile	2017-06-12 14:40:42 +08:00
Huo Yaoyuan	915f61a8f7	Rename to scrollContentContainer.	2017-06-12 14:39:49 +08:00
smoogipooo	419682b740	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework	2017-06-12 13:09:02 +09:00
smoogipooo	157e0e569a	Remove unused file.	2017-06-12 12:57:34 +09:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
Huo Yaoyuan	d5dc37ec62	Merge branch 'master' into profile	2017-06-11 23:41:08 +08:00
smoogipooo	0521d4b761	Merge branch 'master' into dynamic-vertex-attributes ... # Conflicts: # osu-framework	2017-06-10 17:26:16 +09:00
Huo Yaoyuan	3945d33adc	Make OsuTabControl.isEnumType static.	2017-06-09 19:04:29 +08:00
Huo Yaoyuan	798d8711b8	Refactor SectionsContainer to generic.	2017-06-09 16:24:19 +08:00
Huo Yaoyuan	140c74cd2a	Use PageTabControl.	2017-06-09 16:01:16 +08:00
Huo Yaoyuan	5a0bd3b695	Set content in profile sections.	2017-06-09 14:53:00 +08:00
Huo Yaoyuan	283b6b2b5e	Merge branch 'master' into profile	2017-06-09 13:45:32 +08:00
Huo Yaoyuan	5033526070	Fix depth in SectiondContainer.	2017-06-09 13:37:55 +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	513ec4f05f	Merge remote-tracking branch 'origin/master' into dynamic-vertex-attributes	2017-06-08 17:57:39 +09:00
smoogipooo	25ff4de39a	Update with framework changes.	2017-06-08 17:57:06 +09:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
Huo Yaoyuan	e94d98fa84	Expose header background for SectionsContainer.	2017-06-07 22:11:38 +08: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
Dean Herbert	c85a0223b0	Only instantly move tooltip is we are not visible	2017-06-05 20:52:46 +09:00
Dean Herbert	04f0b5204a	Merge branch 'master' into smoothly-moving-tooltips	2017-06-05 20:42:08 +09:00
Thomas Müller	b4b3ba0787	Fix incorrect initial movement of tooltips	2017-06-05 13:07:38 +02:00
Thomas Müller	e92c1210d1	Make osu tooltips move smoothly	2017-06-05 12:59:29 +02:00
Dean Herbert	bf971f6613	Merge branch 'master' into social-browser	2017-06-05 19:16:28 +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
Jorolf	f6e0e0bc38	add caps lock warning	2017-06-03 19:24:53 +02:00
Thomas Müller	2c5979ea8a	Remove unnecessary usings	2017-06-03 17:29:20 +02:00
Thomas Müller	9c6ce230bc	Fix compile error	2017-06-03 17:17:56 +02:00
Thomas Müller	50158a1cd2	Fix incorrect proportions of menu cursor	2017-06-03 16:34:00 +02:00
Jorolf	a43890ffb4	update osu to use the framework's TooltipContainer	2017-06-03 14:50:35 +02:00
smoogipooo	e348f86ce1	Update to match framework.	2017-06-01 14:24:31 +09:00
Seth	394745bca5	Merge branch 'master' into social-browser	2017-05-31 05:18:52 -03:00
Dean Herbert	bab3f1b89a	Merge branch 'master' into user-dropdown-arrow	2017-05-31 15:39:52 +09:00
EVAST9919	8cde50a88a	Merge branch 'master' of https://github.com/ppy/osu into ingame_options	2017-05-31 08:23:06 +03:00
DrabWeb	cd57343191	Text -> Label	2017-05-31 02:03:13 -03:00
DrabWeb	4fd7405fb8	Fix user dropdown menu item chevron alignment	2017-05-31 01:57:32 -03:00
Dean Herbert	8544b45443	Update in line with framework	2017-05-30 22:23:51 +09:00
Dean Herbert	6a6f0913cd	Merge branch 'master' into social-browser	2017-05-30 20:51:50 +09:00
EVAST9919	e737ded382	Applied suggested changes	2017-05-30 12:23:53 +03:00
EVAST9919	963d6e9e8f	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-30 12:04:41 +03:00
smoogipooo	7416952eb3	Fix usings.	2017-05-30 17:36:42 +09:00
smoogipooo	c8066cfde9	Allow Nub/OsuCheckbox/OsuSliderBar colours to be overridden.	2017-05-30 16:40:35 +09:00
Dean Herbert	b8461cd02d	Merge branch 'master' into fix-triangle-smoothness	2017-05-30 08:58:05 +09:00
Thomas Müller	298c0f5757	Structure velocity code more clearly and avoid redundant parenthesis	2017-05-29 19:08:06 +02:00
Thomas Müller	db444a61cb	Reduce per-triangle per-frame computation significantly	2017-05-29 18:30:49 +02:00
Thomas Müller	d3f2d480a8	Fix incorrect triangle state within the first frame	2017-05-29 18:24:17 +02:00
Thomas Müller	2f063ee41d	Make triangle edges smooth again	2017-05-29 18:20:51 +02:00
EVAST9919	08219ccb42	Applied suggested changes	2017-05-29 19:00:29 +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	718eeb6df8	Use linq to tidy up casting	2017-05-29 16:18:07 +09:00
Dean Herbert	4a0c8fb5dd	Merge branch 'master' into breadcrumbs	2017-05-29 15:59:37 +09:00
Dean Herbert	f3422800b1	Merge remote-tracking branch 'upstream/master' into backbutton_beat	2017-05-29 13:04:43 +09:00
Seth	0e087994a1	Merge branch 'master' into social-browser	2017-05-28 15:11:00 -03:00
Dean Herbert	d749fc516d	Update focus handling in line with framework changes	2017-05-28 20:08:46 +09:00
Dean Herbert	bdeaf2dbb4	Update method names in line with framework changes	2017-05-28 18:34:12 +09:00
EVAST9919	743dfcc130	More xmldoc and few Title text fixes	2017-05-28 00:56:11 +03:00
DrabWeb	d4a9813af9	Cleanup BreadcrumbTabItem visibility code	2017-05-27 18:19:09 -03:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
DrabWeb	3699c39967	PADDING -> padding, make private	2017-05-26 16:46:09 -03:00
DrabWeb	33d6b718be	padding -> PADDING	2017-05-26 16:37:52 -03:00
DrabWeb	c9971bb490	Don't store hideChevron	2017-05-26 16:32:46 -03:00
DrabWeb	4c127a6130	CI fixes	2017-05-26 16:29:20 -03:00
DrabWeb	352d3d247b	Fix incorrect sizes	2017-05-26 16:21:37 -03:00
DrabWeb	fb6ed159ca	Use padding for chevron margin	2017-05-26 16:03:51 -03:00
EVAST9919	d052f093d5	Scaling on hover	2017-05-26 14:29:45 +03:00
DrabWeb	cbe36259c3	Add BreadcrumbControl	2017-05-26 07:49:45 -03:00
EVAST9919	2c23703ca6	Removed amplitude container	2017-05-26 13:46:44 +03:00
EVAST9919	ad66587273	Merge remote-tracking branch 'refs/remotes/ppy/master' into backbutton_beat	2017-05-26 13:19:47 +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
smoogipooo	c8cf387f5f	A bit more cleanup.	2017-05-25 22:09:02 +09:00
smoogipooo	91dba765c2	Add back the concept of triangle ordering by size.	2017-05-25 22:03:36 +09:00
smoogipooo	86f6db2d31	Cleanup.	2017-05-25 21:33:49 +09:00
smoogipooo	97e57178a7	Make triangles use raw vertices instead of sprites.	2017-05-25 21:33:04 +09:00
DrabWeb	8e09b738b0	Remove magic numbers	2017-05-24 21:51:00 -03:00
DrabWeb	b57a3f2056	Initial layout of user panel and user dropdown	2017-05-24 19:44:48 -03:00
EVAST9919	181648515b	Moving icon to the beat on the TwoLayerButton	2017-05-24 16:05:24 +03:00
Dean Herbert	45a964cebe	Merge branch 'master' into osu-direct	2017-05-24 15:33:53 +09:00
Dean Herbert	a9d1e54c27	Adjust triangle movement based on amplitude	2017-05-24 13:08:54 +09:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
Dean Herbert	f57b234cc3	Expose Beatmap in BeatSyncedContainer	2017-05-24 01:44:47 +09:00
Dean Herbert	b12300391b	Merge branch 'master'	2017-05-24 01:17:09 +09:00
EVAST9919	178f8127b8	overall fixes	2017-05-23 16:01:00 +03: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	aad6f8f5d6	Refactoring of BeatSyncedContainer.	2017-05-23 16:11:46 +09:00
smoogipooo	1867cbb381	Revert a bit of BeatSyncedContainer for smaller changeset.	2017-05-23 16:06:30 +09:00
smoogipooo	836bf930a0	More cleanups.	2017-05-23 15:29:38 +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	3e0aaa1aa0	Add basic beat response to osu! logo	2017-05-23 12:29:43 +09:00
Dean Herbert	1295b0a7e1	Merge branch 'master' into ColdVolcano/beat-syncing	2017-05-23 10:51:47 +09:00
smoogipooo	adf8bb853e	Move load() to be directly below ctor.	2017-05-22 20:06:37 +09:00
smoogipooo	de575b3867	Early return if beatLength = 0.	2017-05-22 20:02:02 +09:00
smoogipooo	95c4704a9e	Delay backwards instead of using a millisecond tolerance.	2017-05-22 20:01:28 +09:00
Dan Balasescu	fc90cfa604	Update BeatSyncedContainer.cs	2017-05-22 17:50:05 +09:00
Dan Balasescu	a438a8b8d3	Merge branch 'master' into ColdVolcano/beat-syncing	2017-05-22 17:27:22 +09:00
smoogipooo	70d7f61f7c	More inversion for logic simplification.	2017-05-22 17:19:39 +09:00
smoogipooo	f81ffa636d	Use BindTo instead of taking the game's beatmap bindable.	2017-05-22 17:18:11 +09:00
smoogipooo	609aac6453	Better kiai mode detection.	2017-05-22 17:18:05 +09:00
smoogipooo	b241140496	Proper kiai mode detection.	2017-05-22 17:18:00 +09:00
smoogipooo	abe9c464a8	Invert if statements.	2017-05-22 17:17:54 +09:00
Huo Yaoyuan	85684e5fee	Do not scroll headers to when scrolling position is negative.	2017-05-22 15:54:58 +08:00
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
Huo Yaoyuan	d0ff9e6576	Merge branch 'master' into sections	2017-05-22 12:52:27 +08:00
Dean Herbert	82cf94bbff	Move spinner colours to local definition for now ... We don't want to start polluting the OsuColours namespace with non-UI colours.	2017-05-22 09:50:45 +09:00
EVAST9919	0615f104f0	SettingsContainer -> SettingsDropdownContainer	2017-05-21 18:22:27 +03:00
Huo Yaoyuan	7357076c4d	CI fixes.	2017-05-21 04:48:43 +08:00
Huo Yaoyuan	a98f109d73	Use LayoutSize for header and footer layout.	2017-05-21 04:01:07 +08:00
Huo Yaoyuan	93668e53a0	Add footer support.	2017-05-21 03:44:03 +08:00
Huo Yaoyuan	201b44dbf1	Do not make the name confusing.	2017-05-21 03:02:51 +08:00
Huo Yaoyuan	72621c81dc	Handle null and invalidation of headers.	2017-05-21 02:37:34 +08:00
Huo Yaoyuan	e040f297c6	Set Masking = false and expose ScrollContainer.	2017-05-21 02:21:23 +08:00
Huo Yaoyuan	da47b0a260	Fix margin and offset calculating.	2017-05-21 02:11:55 +08:00
ColdVolcano	07d148f708	Merge branch 'master' of ppy/osu into beat-syncing	2017-05-20 11:46:51 -05: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
Huo Yaoyuan	ecc222c043	Allow custom SectionsContainer.	2017-05-20 07:20:46 +08:00
Huo Yaoyuan	473441dfd4	Fix fields being null.	2017-05-20 07:07:27 +08:00
Huo Yaoyuan	e06c917c95	Selection support of SectionsContainer.	2017-05-20 06:39:01 +08:00
Huo Yaoyuan	058c5e18a4	Scrolling support for SectionsContainer.	2017-05-20 05:48:40 +08:00
Huo Yaoyuan	24a813e907	Basic children management of SectionsContainer.	2017-05-20 05:15:57 +08:00
DrabWeb	1d61fc84c7	Remove duplicate code in SettingsEnumDropdown	2017-05-19 17:04:59 -03:00
EVAST9919	6f0e1fccdb	moved autosize to ctor and whitespace fix	2017-05-19 16:08:33 +03:00
EVAST9919	e18f95185f	More constants	2017-05-19 06:39:39 +03:00
EVAST9919	c3647e4056	dropdown-like animation	2017-05-19 06:26:54 +03:00
Javier Flores	793b760ff2	Cleanup logic	2017-05-18 20:19:00 -05:00
DrabWeb	a5fa7e1a7d	Result counts displaying	2017-05-18 17:43:39 -03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	a1b90ee70e	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 18:26:38 +03:00
Dean Herbert	3004a44b98	Further colour adjustments	2017-05-18 22:21:41 +09:00
Dean Herbert	c78dfb4a13	Oops colours were wrong	2017-05-18 21:56:19 +09:00
Dean Herbert	e3ae2bca6d	Design improvements ... paired with smoogi	2017-05-18 21:38:19 +09:00
EVAST9919	640c940fce	Make field readonly	2017-05-18 11:50:15 +03:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
DrabWeb	5fb445e3fe	Basic direct panel, minor cleanups	2017-05-17 16:37:34 -03:00
Javier Flores	f4c7a02a6f	Fix having negative beat when it should be 0	2017-05-17 09:23:04 -05:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
EVAST9919	5fb8830e3a	Moved music controller buttons to it's own class	2017-05-17 10:36:24 +03:00
ColdVolcano	198542465b	More CI fixes	2017-05-17 01:37:31 -05:00
ColdVolcano	387d26a576	CI Fixes	2017-05-17 01:26:34 -05:00
ColdVolcano	5f192cae7b	Add missing licence header	2017-05-17 01:18:56 -05:00
ColdVolcano	0801a211da	Add a base container with beat syncing logic	2017-05-17 01:14:04 -05:00
Huo Yaoyuan	f1d5a92950	Use generic IEqutable to avoid typeless Equals.	2017-05-16 21:49:38 +08:00
Huo Yaoyuan	b9a40a841b	Use IsAssignableFrom.	2017-05-16 21:04:54 +08:00
Dean Herbert	b016d53b85	Fix TwoLayerButton not capturing MouseDown events ... Caused clicks to pass through the skip button to the progress bar.	2017-05-16 17:59:07 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	f730769186	Rewrite to make better	2017-05-15 12:54:56 +09:00
Dean Herbert	3b87a938db	Merge branch 'master' into cursor_size.	2017-05-15 12:23:49 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
EVAST9919	b6460d89c9	Cleanup	2017-05-14 10:26:52 +03:00
EVAST9919	49f5364e9e	CI fixes	2017-05-14 07:35:23 +03:00
EVAST9919	12dab6f75c	iplemented stable-like algorithm	2017-05-14 07:28:12 +03:00