5573 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
smoogipooo	9e5a53aae7	Fix possible nullrefs.	2017-05-29 10:53:55 +09:00
Dean Herbert	06349c580d	Merge pull request #856 from MrTheMake/musiccontroller-init-fix ... Fix initialize beatmap change animation of the music controller	2017-05-29 10:32:56 +09:00
Dean Herbert	7b52c4621d	Merge branch 'master' into musiccontroller-init-fix	2017-05-29 10:28:56 +09:00
DrabWeb	8994c57f3c	Update with framework changes	2017-05-28 15:14:22 -03:00
Seth	0e087994a1	Merge branch 'master' into social-browser	2017-05-28 15:11:00 -03:00
Dean Herbert	d1517257dd	Merge pull request #868 from DrabWeb/user-panel-test-data ... Change UserPanel test case data to use always available covers	2017-05-28 23:29:59 +09:00
Dean Herbert	20c7a5e931	Merge branch 'master' into user-panel-test-data	2017-05-28 23:19:16 +09:00
Dean Herbert	b12bc9dac8	Merge pull request #862 from peppy/fix-nullrefs ... Fix some possible nullrefs on beatmap load failure	2017-05-28 23:18:06 +09:00
Thomas Müller	a4903e62ba	Merge branch 'master' into fix-nullrefs	2017-05-28 16:07:10 +02:00
Dean Herbert	fb24e69d44	Merge pull request #867 from smoogipooo/fix-direct-hotkey ... Fix osu!direct hotkey overriding drawings hotkey (for now).	2017-05-28 22:56:04 +09:00
Dean Herbert	bfede3647f	Merge branch 'master' into fix-direct-hotkey	2017-05-28 22:47:14 +09:00
Dean Herbert	edc650d2eb	Merge pull request #870 from peppy/fix-chat-overlay-drift ... Fix drift when dragging chat beyond bounds	2017-05-28 22:46:17 +09:00
jorolf	9a4abcc199	Merge branch 'master' into better-multimod-animation	2017-05-28 14:39:04 +02:00
Thomas Müller	bb14708165	Merge branch 'master' into fix-chat-overlay-drift	2017-05-28 14:38:39 +02:00
Thomas Müller	005154276a	Merge pull request #869 from peppy/better-focus ... Rework focus (osu! portion)	2017-05-28 14:38:29 +02:00
Dean Herbert	bc47dedf27	Add non-null assertion	2017-05-28 21:34:15 +09:00
Dean Herbert	18bcec723a	Update framework	2017-05-28 21:29:41 +09:00
Dean Herbert	3644198c6e	Fix CI issues	2017-05-28 21:20:11 +09:00
Dean Herbert	ed8b34d5ed	Fix drift when dragging chat beyond bounds	2017-05-28 21:11:46 +09:00
Dean Herbert	013b4f9b89	Update framework	2017-05-28 21:09:44 +09:00