5187 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
Dan Balasescu	af616f66a0	Merge branch 'master' into mania-barlines	2017-05-29 15:33:48 +09:00
smoogipooo	4b6f2efa76	Cleanups.	2017-05-29 15:32:58 +09:00
smoogipooo	32550bda4f	Make drawable bar line a bit more sane.	2017-05-29 15:18:06 +09:00
smoogipooo	4fce0c1189	Rename Barline -> BarLine.	2017-05-29 15:05:20 +09:00
smoogipooo	44f1d906ea	Store tick count locally, remove HoldNote TickCount.	2017-05-29 14:47:51 +09:00
smoogipooo	ee7158aa95	Implement bar lines.	2017-05-29 14:44:42 +09:00
Dan Balasescu	e8be700473	Merge pull request #875 from peppy/update-framework ... Update framework	2017-05-29 13:55:32 +09:00
Dean Herbert	79d249e5ad	Update framework	2017-05-29 13:48:35 +09:00
Dean Herbert	e2dc7329dc	Merge pull request #848 from EVAST9919/backbutton_beat ... Make back button bounce in time to beatmap	2017-05-29 13:13:33 +09:00
Dean Herbert	f3422800b1	Merge remote-tracking branch 'upstream/master' into backbutton_beat	2017-05-29 13:04:43 +09:00
Dean Herbert	d74b0f5861	Merge pull request #874 from smoogipooo/beatmap-always-applydefaults ... Always ApplyDefaults after parsing beatmaps to make sure hit objects …	2017-05-29 12:24:56 +09:00
smoogipooo	c137ee822c	Give velocity a sane default value.	2017-05-29 12:19:51 +09:00
smoogipooo	231b1ae610	We don't need a curve.	2017-05-29 12:19:38 +09:00
smoogipooo	6101fe98e1	Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state.	2017-05-29 12:10:29 +09:00
smoogipooo	e63108bd75	Add base for bar lines.	2017-05-29 11:56:31 +09:00
smoogipooo	f17b8acd13	Remove erroneous tab.	2017-05-29 11:45:16 +09:00
Dan Balasescu	57fb298690	Merge branch 'master' into mania-judgements	2017-05-29 11:43:01 +09:00
smoogipooo	e5e73b31b6	Cleanup + slight xmldoc improvements.	2017-05-29 11:42:43 +09:00
Dean Herbert	0fd053707d	Merge pull request #850 from smoogipooo/mania-holdnote-input ... Mania holdnote input	2017-05-29 11:33:32 +09:00
smoogipooo	79cdba58c1	Merge branch 'mania-holdnote-input' into mania-judgements	2017-05-29 11:23:32 +09:00
smoogipooo	af137f40e5	Merge remote-tracking branch 'origin/master' into mania-judgements	2017-05-29 11:22:06 +09:00
smoogipooo	cd1da469c7	Cleanup + actually fix possible nullrefs.	2017-05-29 11:14:37 +09:00
smoogipooo	cdf4fcea02	Fix input being reversed.	2017-05-29 11:07:17 +09:00
smoogipooo	27d6cb6275	Merge remote-tracking branch 'origin/master' into mania-holdnote-input	2017-05-29 10:57:49 +09:00
smoogipooo	cf3743f698	Update framework.	2017-05-29 10:56:42 +09:00