4928 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DrabWeb	72c9959215	resultCounts -> ResultAmounts	2017-05-24 02:40:34 -03:00
DrabWeb	ba2627d4e2	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-24 02:40:00 -03:00
DrabWeb	e59c1879a2	Remove tabs	2017-05-24 02:38:55 -03:00
DrabWeb	4490596f5f	Keep one object per file	2017-05-24 02:37:27 -03:00
DrabWeb	b08668b6d9	Remove @ from to-be-localized strings	2017-05-24 02:19:45 -03:00
Dean Herbert	5e01940770	Compare with private field	2017-05-24 13:43:10 +09:00
Dean Herbert	15ee2b802e	Hide direct overlay when requested	2017-05-24 13:41:07 +09:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
Dean Herbert	03c745abc3	Merge pull request #841 from smoogipooo/controlpoint-rework ... Fix negative beatIndex NewBeats not being correctly fired	2017-05-24 12:14:17 +09:00
Dean Herbert	c4916426f5	Merge branch 'master' into controlpoint-rework	2017-05-24 12:00:22 +09:00
Dean Herbert	5efe693e79	Merge pull request #833 from peppy/logo-beat ... Animate osu! logo with playing beatmap	2017-05-24 11:56:22 +09:00
Dean Herbert	53f489b447	Remove using	2017-05-24 11:50:12 +09:00
Dean Herbert	b1bd88ae71	Merge branch 'master' into logo-beat	2017-05-24 11:41:02 +09:00
Dean Herbert	3af7f89a95	Merge pull request #812 from ColdVolcano/menu-flashes ... Menu flashes	2017-05-24 11:40:53 +09:00
Dan Balasescu	90d54a6cfe	Merge branch 'master' into logo-beat	2017-05-24 10:36:30 +09:00
Dean Herbert	87a2cc2004	Merge branch 'master' into menu-flashes	2017-05-24 10:10:29 +09:00
ColdVolcano	207d6e4ac3	Update to new syntax of OnNewBeat	2017-05-23 20:01:20 -05:00
ColdVolcano	c6d744eb7c	Merge branch 'master' of ppy/osu into menu-flashes	2017-05-23 20:00:02 -05:00
Dean Herbert	a22e11df03	Merge pull request #842 from MrTheMake/songselect-fix ... Fix song select scheduled beatmap change task not being canceled	2017-05-24 09:59:09 +09:00
Dean Herbert	dee6a1e2be	Merge branch 'master' into songselect-fix	2017-05-24 09:45:34 +09:00
MrTheMake	24f64c8815	More formatting	2017-05-24 02:38:05 +02:00
MrTheMake	67774192dd	Formatting fixes	2017-05-24 02:30:32 +02:00
MrTheMake	0616256bd0	CI fix	2017-05-24 02:23:52 +02:00
MrTheMake	09adb23591	Fix scheduled task not being canceled	2017-05-24 02:22:30 +02:00
DrabWeb	be1ae2bd8e	Remove ??, value can never be null	2017-05-23 15:08:02 -03:00
Dean Herbert	b477e5cd9e	Fix potential nullref	2017-05-24 02:53:21 +09:00
smoogipooo	0a385055dc	Remove Func<T>'d-ness.	2017-05-24 02:53:08 +09:00
DrabWeb	7a4b476121	Tab character	2017-05-23 14:46:23 -03:00
DrabWeb	aa9a636c3c	Indentation	2017-05-23 14:42:57 -03:00
DrabWeb	7b9eacc213	CI fixes	2017-05-23 14:41:30 -03:00
DrabWeb	fbbcc80a3e	Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct	2017-05-23 14:34:58 -03:00
DrabWeb	4f17a4fe91	Make result counts scroll with the panels	2017-05-23 14:34:34 -03:00
smoogipooo	41824e0179	Add comment.	2017-05-24 02:24:10 +09:00
smoogipooo	2d1df8fd8a	xmldoc fixes.	2017-05-24 02:22:28 +09:00
smoogipooo	9e7f384203	Fix returning incorrect control points for non-timing points.	2017-05-24 02:19:22 +09:00
Dean Herbert	813b09189c	Remove unused parameter	2017-05-24 02:09:31 +09:00
Dean Herbert	84499275ad	Update framework	2017-05-24 01:58:07 +09:00
Dean Herbert	7e827c4f11	Add amplitude adjust	2017-05-24 01:45:01 +09:00
Dean Herbert	f57b234cc3	Expose Beatmap in BeatSyncedContainer	2017-05-24 01:44:47 +09:00
smoogipooo	462bbd02ba	Simplify expression.	2017-05-24 01:38:28 +09:00
smoogipooo	7628cdf522	Return first control point in the list if the time is before it.	2017-05-24 01:38:04 +09:00
Dean Herbert	b12300391b	Merge branch 'master'	2017-05-24 01:17:09 +09:00
Dean Herbert	952179332f	Merge pull request #831 from smoogipooo/beat-sync-container-improvements ... Beat sync container improvements	2017-05-24 01:05:02 +09:00
Dean Herbert	ef1712a5af	Merge branch 'master' into beat-sync-container-improvements	2017-05-24 00:46:14 +09:00
Dean Herbert	acce59cdb3	Merge pull request #830 from smoogipooo/controlpoint-rework ... Split out ControlPoints into more specific types	2017-05-24 00:41:59 +09:00
Dean Herbert	0842e00f13	Merge branch 'master' into controlpoint-rework	2017-05-24 00:20:15 +09:00
Dean Herbert	d162a2b033	Merge pull request #832 from peppy/menu-music-osz ... Read menu music from osz resource	2017-05-24 00:09:46 +09:00
Dean Herbert	a48a03bf38	Merge branch 'master' into menu-music-osz	2017-05-23 23:56:07 +09:00
Dean Herbert	7e3caa19fd	Merge pull request #837 from EVAST9919/fixes ... Tidy ups	2017-05-23 23:50:44 +09:00
EVAST9919	564abc1a5b	using autosize instead of constant height	2017-05-23 14:32:45 +03:00