5350 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Dean Herbert	cf540a60a2	Merge pull request #873 from smoogipooo/mania-judgements ... Mania judgements	2017-05-29 22:06:59 +09:00
Dean Herbert	476526714d	Merge branch 'master' into mania-judgements	2017-05-29 21:31:48 +09:00
Dean Herbert	efab2296e1	Merge pull request #876 from smoogipooo/mania-barlines ... Mania barlines	2017-05-29 21:31:00 +09:00
Dean Herbert	a0c542f461	Merge branch 'master' into mania-barlines	2017-05-29 20:36:50 +09:00
Dean Herbert	d1f32cfbf0	Merge pull request #877 from smoogipooo/mania-holdnote-input ... Fix hold note samples not being set correctly for mania-specific beatmaps.	2017-05-29 18:34:23 +09:00
Dean Herbert	fe3e8b146f	Merge branch 'master' into mania-holdnote-input	2017-05-29 18:20:31 +09:00
Dean Herbert	1f247bf213	Merge pull request #864 from Jorolf/better-multimod-animation ... Improve animation when rotating between available mods	2017-05-29 18:20:22 +09:00
Dean Herbert	0f2508072b	Merge branch 'master' into mania-holdnote-input	2017-05-29 18:14:30 +09:00
Dan Balasescu	6918368afc	Merge branch 'master' into ingame_options	2017-05-29 18:12:02 +09:00
Dan Balasescu	e4b876ff5b	Update ModButton.cs	2017-05-29 18:10:02 +09:00
Dean Herbert	7960b5cf26	More refactoring ... Also allows rotation when reaching the end of the available mods.	2017-05-29 18:03:40 +09:00
Dan Balasescu	94ae730a20	Merge branch 'master' into storyboards	2017-05-29 17:49:51 +09:00
Dean Herbert	5e473c6c96	Merge remote-tracking branch 'upstream/master' into better-multimod-animation	2017-05-29 17:21:49 +09:00
Dean Herbert	31cc6917bc	Tidy up code, improve transition, add directionality	2017-05-29 17:20:55 +09:00
Dean Herbert	cc201c4a9f	Merge pull request #865 from DrabWeb/breadcrumbs ... Breadcrumb Tab Control	2017-05-29 16:36:43 +09:00
Dan Balasescu	fe7fec88f9	Merge branch 'master' into mania-holdnote-input	2017-05-29 16:21:33 +09:00
Dean Herbert	718eeb6df8	Use linq to tidy up casting	2017-05-29 16:18:07 +09:00
smoogipooo	e529ced131	Fix mania-specific beatmaps not setting samples correctly.	2017-05-29 16:18:01 +09:00
smoogipooo	586fc782cf	Fix line endings.	2017-05-29 16:00:14 +09:00
Dean Herbert	4a0c8fb5dd	Merge branch 'master' into breadcrumbs	2017-05-29 15:59:37 +09:00
Dan Balasescu	0327adcba8	Update HoldNote.cs	2017-05-29 15:35:50 +09:00