222 Commits

Author	SHA1	Message	Date
EVAST9919	08219ccb42	Applied suggested changes	2017-05-29 19:00:29 +03:00
Dan Balasescu	6918368afc	Merge branch 'master' into ingame_options	2017-05-29 18:12:02 +09:00
EVAST9919	bedcf04043	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-27 02:25:03 +03:00
Dean Herbert	5eab611255	Fix some possible nullrefs on beatmap load failure	2017-05-26 17:36:38 +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
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
MrTheMake	57b9ed0f54	Do not pause a running replay if the window is not focused.	2017-05-20 18:56:50 +02:00
EVAST9919	9f803de9d5	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 19:49:48 +03:00
Dean Herbert	561b517dec	Merge branch 'master' into skip-redesign	2017-05-20 00:42:04 +09:00
Dean Herbert	20156d26f9	Don't rely on parent's clock	2017-05-19 22:12:09 +09:00
EVAST9919	b2b299a8c3	Fixed the ability to change visibility even not in replay	2017-05-19 15:54:21 +03:00
Dean Herbert	aef82acb0d	Update skip button design	2017-05-19 21:54:14 +09:00
EVAST9919	4d0d27aa88	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 15:25:48 +03: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
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
EVAST9919	35bc3a42aa	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 06:36:15 +03:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
EVAST9919	0867ef814c	Visible only in replay	2017-05-17 15:54:12 +03: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	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
Dean Herbert	ab1768ef80	Merge branch 'master' into tidy-up	2017-05-09 10:27:29 +09:00
Dean Herbert	48368779ab	Avoid polluting Player with HUD-specific code.	2017-05-08 11:48:40 +09:00
Huo Yaoyuan	4f8549f220	Standardise usages of exceptions.	2017-05-07 00:38:17 +08:00
Dean Herbert	9c4f813da1	Remove unnecessary hide/show logic. ... Also change the way the overlay appears when actually playing.	2017-05-05 13:14:44 +09:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
EVAST9919	475eb6fe5f	Cleanup	2017-05-04 17:29:52 +03:00
EVAST9919	7e1efcc20b	Added ModsContainer	2017-05-02 22:34:07 +03:00
Dan Balasescu	f261a077d2	General fixes/cleanup in Player.	2017-04-26 20:37:47 +09:00
Dean Herbert	c2108b7706	Use object initialiser.	2017-04-26 18:32:47 +09:00
Dean Herbert	b6f838f536	Fix potential nullref.	2017-04-26 18:32:40 +09:00
Dean Herbert	4656a7170a	Add very basic lead-in support.	2017-04-26 18:17:25 +09:00
Dean Herbert	9d14b6e1e9	Make SongProgress return the actual time value via OnSeek.	2017-04-26 18:17:17 +09:00
Dean Herbert	01caaf44f3	Add a decoupled clock to allow for lead-in and lead-out time.	2017-04-26 18:16:55 +09:00
Dean Herbert	d476482493	Add basic seeking support when a replay is loaded.	2017-04-25 22:59:51 +09:00
Jorolf	1d2f19b5a2	change background dim from integer to double	2017-04-22 18:34:03 +02:00
Dean Herbert	caf3d311cd	Merge remote-tracking branch 'upstream/master' into speed-adjust-mods	2017-04-21 20:55:20 +09:00
Dean Herbert	d94035e9da	Merge branch 'master' into general-fixes	2017-04-21 20:42:46 +09:00
Dean Herbert	3f832731c9	Add DoubleTime, HalfTime and Nightcore support.	2017-04-21 17:33:37 +09:00
Dean Herbert	5fdc9819cf	Add basic UO support (now called Audio Offset).	2017-04-21 16:20:05 +09:00
Dean Herbert	5aa90df819	Allow OsuScreens to decide whether ruleset switching should be allowed. ... Tidies up ToolbarModeSelector a lot by using DI.	2017-04-21 16:03:59 +09:00
Dean Herbert	1707c2458e	Update exception name.	2017-04-20 12:11:03 +09:00
Dean Herbert	873599b359	Fix conversion regression.	2017-04-20 11:36:50 +09:00
Dean Herbert	a47870b376	Apply Ruleset to Scores. Reduce complexity of score creation.	2017-04-20 11:16:08 +09:00
Dean Herbert	3b95fbab7d	Add score statistic tracking (osu!).	2017-04-19 16:29:27 +09:00