397 Commits

Author	SHA1	Message	Date
Thomas Müller	a4903e62ba	Merge branch 'master' into fix-nullrefs	2017-05-28 16:07:10 +02:00
Dean Herbert	bdeaf2dbb4	Update method names in line with framework changes	2017-05-28 18:34:12 +09:00
Dean Herbert	5eab611255	Fix some possible nullrefs on beatmap load failure	2017-05-26 17:36:38 +09:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
Dean Herbert	0842e00f13	Merge branch 'master' into controlpoint-rework	2017-05-24 00:20:15 +09:00
EVAST9919	2e28b10c36	CI fixes and removed useless property	2017-05-23 12:24:16 +03: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
Dean Herbert	0634a3a5c5	Merge branch 'master' into osu-direct	2017-05-23 17:33:20 +09:00
smoogipooo	3cdfd2eef5	Split ControlPoint into different types. ... # Conflicts: # osu.Game.Rulesets.Mania/UI/Column.cs	2017-05-23 14:03:40 +09:00
MrTheMake	57b9ed0f54	Do not pause a running replay if the window is not focused.	2017-05-20 18:56:50 +02:00
Dean Herbert	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
DrabWeb	1eb96e07bd	Remove unused using directive	2017-05-20 03:01:09 -03:00
DrabWeb	0c5fec975d	Change ModDisplay to use ReverseDepthFillFlowContainer	2017-05-20 02:56:00 -03:00
Dean Herbert	561b517dec	Merge branch 'master' into skip-redesign	2017-05-20 00:42:04 +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
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
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	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
Dean Herbert	88a70e407c	Fix and simplifty pause logic ... Resolves #770	2017-05-17 20:11:41 +09:00
Dean Herbert	6487bf45cf	Eagerly attempt to pause the game when the window is not focused	2017-05-16 17:59:14 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
EVAST9919	9a04069123	removed useless booleans, using nullables instead	2017-05-12 10:16:31 +03:00
EVAST9919	34b4efc4e9	Applied suggested changes	2017-05-12 08:12:34 +03:00
EVAST9919	79ed92a0d7	Simplified logic	2017-05-12 01:48:28 +03:00
EVAST9919	ea0add2354	Fixed update condition	2017-05-11 02:34:57 +03:00
EVAST9919	d55c97a08a	Stop progress as soon as we at 100%	2017-05-11 01:48:46 +03:00
EVAST9919	5b469eff69	Fixes	2017-05-10 10:33:02 +03:00
EVAST9919	d8f9e71b84	Applied suggested changes	2017-05-10 10:14:44 +03:00
EVAST9919	7b17e331c4	cleanups	2017-05-10 03:45:31 +03:00
EVAST9919	315f1f1256	CI fixes	2017-05-09 06:23:03 +03:00
EVAST9919	2c92ee432b	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-09 06:05:46 +03:00
EVAST9919	2826c663fd	Apply suggested changes	2017-05-09 06:05:37 +03:00
Dean Herbert	ab1768ef80	Merge branch 'master' into tidy-up	2017-05-09 10:27:29 +09:00
EVAST9919	de2486b8e6	Moved timeLeft recalculation to property	2017-05-08 20:36:02 +03:00
EVAST9919	17d1ecb8f5	Use float type for progress value	2017-05-08 19:42:36 +03:00
EVAST9919	4b5e24cc36	Changed logic a bit	2017-05-08 19:14:19 +03:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03:00
Dean Herbert	48368779ab	Avoid polluting Player with HUD-specific code.	2017-05-08 11:48:40 +09:00
EVAST9919	f0145c7f4f	Trying to woke up AppVeyor	2017-05-08 02:16:56 +03:00
EVAST9919	926ed907c2	CI fixes	2017-05-08 02:00:21 +03:00
EVAST9919	dda25219bc	code fixes	2017-05-08 01:54:31 +03:00
EVAST9919	c3a42ded36	Fixed Graph/seeking offset	2017-05-08 01:23:51 +03:00