Commit Graph

214 Commits

Author SHA1 Message Date
ee96d39b93 Shuffle sound samples around and make more conformant 2017-06-28 10:19:04 -07:00
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
5568df1aee Remove StandardHUDOverlay
This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now.

We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.
2017-06-05 17:18:07 +09:00
5eab611255 Fix some possible nullrefs on beatmap load failure 2017-05-26 17:36:38 +09:00
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
57b9ed0f54 Do not pause a running replay if the window is not focused. 2017-05-20 18:56:50 +02:00
561b517dec Merge branch 'master' into skip-redesign 2017-05-20 00:42:04 +09:00
20156d26f9 Don't rely on parent's clock 2017-05-19 22:12:09 +09:00
aef82acb0d Update skip button design 2017-05-19 21:54:14 +09:00
da31d129ee Merge branch 'master' into mania-beatmap-conversion 2017-05-19 18:18:59 +09:00
a7d16ac213 Move skip logic to inside SkipButton 2017-05-19 18:18:21 +09:00
9191c4f3e3 Remove LegacyBeatmapConverter. 2017-05-19 16:31:56 +09:00
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
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
41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00
88a70e407c Fix and simplifty pause logic
Resolves #770
2017-05-17 20:11:41 +09:00
6487bf45cf Eagerly attempt to pause the game when the window is not focused 2017-05-16 17:59:14 +09:00
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
48368779ab Avoid polluting Player with HUD-specific code. 2017-05-08 11:48:40 +09:00
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
9c4f813da1 Remove unnecessary hide/show logic.
Also change the way the overlay appears when actually playing.
2017-05-05 13:14:44 +09:00
c9ba1ac4f6 Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
7e1efcc20b Added ModsContainer 2017-05-02 22:34:07 +03:00
f261a077d2 General fixes/cleanup in Player. 2017-04-26 20:37:47 +09:00
c2108b7706 Use object initialiser. 2017-04-26 18:32:47 +09:00
b6f838f536 Fix potential nullref. 2017-04-26 18:32:40 +09:00
4656a7170a Add very basic lead-in support. 2017-04-26 18:17:25 +09:00
9d14b6e1e9 Make SongProgress return the actual time value via OnSeek. 2017-04-26 18:17:17 +09:00
01caaf44f3 Add a decoupled clock to allow for lead-in and lead-out time. 2017-04-26 18:16:55 +09:00
d476482493 Add basic seeking support when a replay is loaded. 2017-04-25 22:59:51 +09:00
1d2f19b5a2 change background dim from integer to double 2017-04-22 18:34:03 +02:00
caf3d311cd Merge remote-tracking branch 'upstream/master' into speed-adjust-mods 2017-04-21 20:55:20 +09:00
d94035e9da Merge branch 'master' into general-fixes 2017-04-21 20:42:46 +09:00
3f832731c9 Add DoubleTime, HalfTime and Nightcore support. 2017-04-21 17:33:37 +09:00
5fdc9819cf Add basic UO support (now called Audio Offset). 2017-04-21 16:20:05 +09:00
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
1707c2458e Update exception name. 2017-04-20 12:11:03 +09:00
873599b359 Fix conversion regression. 2017-04-20 11:36:50 +09:00
a47870b376 Apply Ruleset to Scores. Reduce complexity of score creation. 2017-04-20 11:16:08 +09:00
3b95fbab7d Add score statistic tracking (osu!). 2017-04-19 16:29:27 +09:00
49f4981f1c Fix CI issues. 2017-04-18 22:28:16 +09:00
a0d9c14526 Add temporary means of getting the user which is responsible for a resulting play. 2017-04-18 22:22:14 +09:00
d51b37cb44 Add a basic implementation of the new design results screen. 2017-04-18 22:22:14 +09:00
edd71c0560 Tidy up and comment PlayerLoader logic. 2017-04-18 16:56:01 +09:00
2ccb8b154f Change conditional ordering to allow player to always run its fadeOut sequence. 2017-04-18 16:47:30 +09:00
24deaf05b6 Merge branch 'master' into player-loader-restart 2017-04-18 16:36:25 +09:00
fbd26a1d5e Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
1f7373db8f Removed unneeded restarting variable 2017-04-17 23:52:38 -07:00