5353 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jorolf	af9b02746a	make fields readonly	2017-05-23 18:19:01 +02: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
Jorolf	64cee72464	Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item	2017-05-23 17:51:46 +02:00
Jorolf	320e7b358e	revert framework	2017-05-23 17:50:28 +02: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
Jorolf	7d28290a4a	update framework	2017-05-23 17:35:40 +02:00
Jorolf	7ad10009e6	Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item	2017-05-23 17:32:48 +02: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
MrTheMake	0603be5937	Unregister OnBeatmapChanged() when exiting song selection	2017-05-23 15:30:15 +02:00
EVAST9919	178f8127b8	overall fixes	2017-05-23 16:01:00 +03:00
EVAST9919	2ca0794b37	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-23 14:45:38 +03:00
EVAST9919	564abc1a5b	using autosize instead of constant height	2017-05-23 14:32:45 +03:00
EVAST9919	165d6ef1bb	Make transition a bit smoother	2017-05-23 12:30:39 +03:00
Dan Balasescu	2d806c7f11	Merge branch 'master' into menu-music-osz	2017-05-23 18:26:48 +09:00
EVAST9919	2e28b10c36	CI fixes and removed useless property	2017-05-23 12:24:16 +03:00
EVAST9919	c7a241246e	Better letterbox settings transition	2017-05-23 12:09:32 +03:00
smoogipooo	76fe4af9a6	Fix visual test failing.	2017-05-23 18:06:31 +09:00
smoogipooo	9255297075	Cleanup.	2017-05-23 17:59:45 +09:00
smoogipooo	ae94e6ea85	Redesign hit explosions.	2017-05-23 17:57:34 +09:00
EVAST9919	4b23cc47ea	Moved KeyCounter visibility logic to it's own class	2017-05-23 11:53:42 +03:00
EVAST9919	eafe215169	Simplify Hud visibility change	2017-05-23 11:53:12 +03:00
smoogipooo	25a48d832f	Make kiai time hit object pulse on bar line beats.	2017-05-23 17:36:43 +09:00
Dean Herbert	0634a3a5c5	Merge branch 'master' into osu-direct	2017-05-23 17:33:20 +09:00