2975 Commits

Author	SHA1	Message	Date
Dean Herbert	c2572eea27	Merge branch 'master' into debug-config-rename	2017-05-20 01:15:55 +09:00
Dean Herbert	a34d9d8b09	Oops	2017-05-20 01:14:51 +09:00
Dean Herbert	9c9c0a64fd	Merge branch 'master' into debug-config-rename	2017-05-20 00:45:16 +09:00
Dean Herbert	561b517dec	Merge branch 'master' into skip-redesign	2017-05-20 00:42:04 +09:00
Dan Balasescu	7e8ffe8f34	Merge branch 'master' into osd-fixes	2017-05-20 00:12:10 +09:00
Dean Herbert	528d79be51	FrameworkDebugConfig -> DebugSetting	2017-05-19 22:53:26 +09:00
Dean Herbert	0332348b24	Correctly display default audio device on OSD	2017-05-19 22:51:09 +09:00
Dean Herbert	5bcef91b89	Add padding to setting value on on screen display ... Long audio device names were destroying all padding.	2017-05-19 22:49:47 +09:00
Dean Herbert	04f7acb68a	Add setting checkbox to toggle debug logs	2017-05-19 22:47:15 +09:00
Dean Herbert	674731f9bb	Add sound back to skip action	2017-05-19 22:23:48 +09:00
Dean Herbert	60f960aafd	Fix audio clock breakage.	2017-05-19 22:19:20 +09:00
Dean Herbert	20156d26f9	Don't rely on parent's clock	2017-05-19 22:12:09 +09:00
Dean Herbert	aef82acb0d	Update skip button design	2017-05-19 21:54:14 +09:00
Dean Herbert	da31d129ee	Merge branch 'master' into mania-beatmap-conversion	2017-05-19 18:18:59 +09:00
Dean Herbert	a7d16ac213	Move skip logic to inside SkipButton	2017-05-19 18:18:21 +09:00
smoogipooo	9191c4f3e3	Remove LegacyBeatmapConverter.	2017-05-19 16:31:56 +09:00
Dean Herbert	36b628bbcc	Merge branch 'master' into fix-early-inactive-pause	2017-05-19 16:21:20 +09:00
smoogipooo	67cf64062a	Add flag to determine whether the beatmap requested for conversion is for the current ruleset.	2017-05-19 16:02:40 +09:00
Dan Balasescu	0e469feb17	Merge branch 'master' into fix-unnecessary-seeks	2017-05-19 15:10:13 +09:00
Dean Herbert	bfd37d0350	Fix audio beginning to play when potentially paused due to inactive window ... Also removes all usage of Delay() in Player. Resolves #793.	2017-05-19 13:53:09 +09:00
Dean Herbert	5ae3a7143e	Fix audio seeking when entering play mode in certain cases ... Resolves #794	2017-05-19 13:23:11 +09:00
Dean Herbert	c51d640241	Add support for searching beatmap author at song select ... Resolves #792	2017-05-19 13:13:27 +09:00
Dean Herbert	3004a44b98	Further colour adjustments	2017-05-18 22:21:41 +09:00
Dean Herbert	c78dfb4a13	Oops colours were wrong	2017-05-18 21:56:19 +09:00
Dean Herbert	e3ae2bca6d	Design improvements ... paired with smoogi	2017-05-18 21:38:19 +09:00
smoogipooo	afd3eb4b8d	Implement things a bit more to remove warnings.	2017-05-18 18:04:32 +09:00
smoogipooo	eebd5a910e	Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion	2017-05-18 11:59:31 +09:00
Dan Balasescu	32c471d285	Merge branch 'master' into pause-container	2017-05-18 01:22:37 +09:00
Dean Herbert	8084c575ef	Merge branch 'master' into fix-fail-pause-conflict	2017-05-17 23:32:41 +09:00
Dean Herbert	25f217505e	Merge branch 'master' into song-select-selection-fixes	2017-05-17 23:17:10 +09:00
Dean Herbert	1278d9c53d	Merge branch 'master' into bad-bad-ratio-container	2017-05-17 23:01:56 +09:00
Dean Herbert	d606b5b3a7	Fix CI warning	2017-05-17 22:13:56 +09:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
smoogipooo	74c23ff6d8	Add base for event parsing code.	2017-05-17 20:46:23 +09:00
Dean Herbert	88a70e407c	Fix and simplifty pause logic ... Resolves #770	2017-05-17 20:11:41 +09:00
Dean Herbert	cba7796777	Fix ratio container being added to a level too high ... That's a bad ratio container! How did we not notice this until now?	2017-05-17 18:49:30 +09:00
Dan Balasescu	b21be8f3f5	Merge branch 'master' into fix-chat-after-disconnect	2017-05-17 17:51:35 +09:00
Dean Herbert	7bb38e927b	Fix song select reverting to first difficulty of current group on entering	2017-05-17 17:33:20 +09:00
Dean Herbert	cab12ee55a	Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed	2017-05-17 17:33:16 +09:00
Dean Herbert	78c1d4581f	Revert "Use generic IComparable for message." ... This reverts commit aaaee5ed10.	2017-05-17 13:44:43 +09:00
smoogipooo	9565bb9572	Fix hold notes - remove glow for now. ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs	2017-05-17 13:09:49 +09:00
smoogipooo	17466a662c	Add hold note conversion.	2017-05-17 13:09:07 +09:00
Dean Herbert	231f7939a6	Fix channels being unnecessarily recycled on disconnect ... Resolves #768	2017-05-17 12:42:02 +09:00
Dean Herbert	12cb530358	Merge branch 'master' into tidy-up	2017-05-17 09:24:11 +09:00
nyaamara	a3e93afb37	Merge pull request #3 from ppy/master ... cool	2017-05-16 16:57:45 -04:00
nyaamara	b22c84287a	Fix typo.	2017-05-16 16:54:33 -04:00
Huo Yaoyuan	e2a7f00a52	Remove unused namespace.	2017-05-16 22:20:05 +08:00
Huo Yaoyuan	f1d5a92950	Use generic IEqutable to avoid typeless Equals.	2017-05-16 21:49:38 +08:00
Huo Yaoyuan	aaaee5ed10	Use generic IComparable for message.	2017-05-16 21:46:22 +08:00
Huo Yaoyuan	e911441394	Why AbandonedMutexException?	2017-05-16 21:23:14 +08:00