625 Commits

Author	SHA1	Message	Date
Dean Herbert	f2cac17188	Merge branch 'master' into timingchange-rework	2017-06-16 17:04:43 +09: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
Dan Balasescu	6fd37ebc32	Merge branch 'master' into timingchange-rework	2017-06-15 16:23:51 +09:00
smoogipooo	99a93d98dc	Merge remote-tracking branch 'origin/master' into fix-hacky-tabs	2017-06-13 19:46:01 +09: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
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
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
smoogipooo	0521d4b761	Merge branch 'master' into dynamic-vertex-attributes ... # Conflicts: # osu-framework	2017-06-10 17:26:16 +09: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
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
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