5590 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	0f59645e17	Increase timeout in TestImportOverIPC ... Has been failing CI randomly, so let's increase the timeout a bit.	2017-05-31 15:51:52 +09:00
Dean Herbert	013e9d5c69	Merge pull request #886 from DrabWeb/user-dropdown-arrow ... Fix user dropdown menu item chevron alignment	2017-05-31 15:44:17 +09: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
Dan Balasescu	2c438e6a8e	Merge pull request #882 from peppy/update-framework ... Update in line with framework	2017-05-31 13:16:29 +09:00
Dan Balasescu	d90006b229	Merge branch 'master' into update-framework	2017-05-31 13:01:17 +09:00
Dean Herbert	9a40470298	Merge pull request #838 from MrTheMake/playsongselect-exit-fix ... Unregister OnBeatmapChanged() when exiting song selection	2017-05-31 11:31:12 +09:00
Dean Herbert	40312080f7	Merge branch 'master' into playsongselect-exit-fix	2017-05-31 11:14:41 +09:00
Dean Herbert	61fb5d6ac8	Add issue URL to comment	2017-05-31 11:04:18 +09:00
Dean Herbert	b61452024a	Add comment	2017-05-31 11:02:26 +09:00
Shawdooow	cb5fcf2572	change mania multiplier	2017-05-30 13:27:10 -04:00
Shawdooow	ecc0d0b11c	Daycore mod	2017-05-30 12:49:06 -04:00
Dean Herbert	8544b45443	Update in line with framework	2017-05-30 22:23:51 +09:00
smoogipooo	223c75327f	Remove key/val in favor of local variables + method call.	2017-05-30 20:59:53 +09:00
Dean Herbert	6a6f0913cd	Merge branch 'master' into social-browser	2017-05-30 20:51:50 +09:00
smoogipooo	5b5c2e4717	Back to using val...	2017-05-30 20:37:30 +09:00
smoogipooo	0728aea6a4	Fixes + cleanup.	2017-05-30 20:26:39 +09:00
Dan Balasescu	fe68e1b1af	Merge branch 'master' into storyboards	2017-05-30 19:53:44 +09:00
smoogipooo	93a33be596	val -> value, val -> line (in cases where a key is not used).	2017-05-30 19:52:43 +09:00
smoogipooo	0175b91927	Cleanups.	2017-05-30 19:52:21 +09:00
EVAST9919	4b624ced36	CI fixes	2017-05-30 12:31:56 +03: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	72fa50f944	Make replay settings match design colours.	2017-05-30 17:02:04 +09:00
smoogipooo	c8066cfde9	Allow Nub/OsuCheckbox/OsuSliderBar colours to be overridden.	2017-05-30 16:40:35 +09:00
DrabWeb	a1453eb9e1	Fix filter text box input	2017-05-29 22:52:38 -03:00
DrabWeb	b6cb9d3229	Fix display style dropdown scaling the filter control	2017-05-29 22:39:59 -03:00
DrabWeb	2edbf64d69	Redundant parentheses	2017-05-29 22:22:14 -03:00
DrabWeb	96efa5a240	Hook up to channel selector tab item	2017-05-29 22:10:07 -03:00
DrabWeb	b9292b6240	Merge https://github.com/ppy/osu into channel-selection	2017-05-29 22:06:05 -03:00
Dean Herbert	03ac700838	Merge pull request #786 from Jorolf/channel-selector-tab-item ... Add an "Add new channel" tab	2017-05-30 10:05:26 +09:00
DrabWeb	2ba86cffa6	Channel list item hover effect	2017-05-29 22:04:53 -03:00
DrabWeb	d8e86da78c	Better scroll dragger position	2017-05-29 22:00:15 -03:00
Dean Herbert	e91a3f06f1	Merge remote-tracking branch 'upstream/master' into channel-selector-tab-item	2017-05-30 09:54:35 +09:00
Dean Herbert	fde579262f	User a simpler method to hide the background icon	2017-05-30 09:54:29 +09:00
DrabWeb	d29bf58817	Show scroll dragger	2017-05-29 21:50:15 -03:00
DrabWeb	745e2e5e18	Make the channel selection overlay hide/resize with chat	2017-05-29 21:23:03 -03:00
Dean Herbert	751e954735	Merge pull request #879 from Tom94/fix-triangle-smoothness ... Fix triangle smoothness and optimize further	2017-05-30 09:15:09 +09:00
Dean Herbert	b8461cd02d	Merge branch 'master' into fix-triangle-smoothness	2017-05-30 08:58:05 +09:00
DrabWeb	50e50ce67e	Update with framework changes	2017-05-29 20:33:28 -03:00
DrabWeb	21a8071293	Merge https://github.com/ppy/osu into channel-selection	2017-05-29 20:31:35 -03: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
EVAST9919	261f1f4e1f	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-29 18:13:44 +03:00