Commit Graph

646 Commits

Author SHA1 Message Date
cb8029af9e Add a setting to hide storyboards. 2017-09-15 09:16:56 +02:00
ddaf28d7f6 Integrate storyboards with gameplay. 2017-09-15 09:16:56 +02:00
2e0218f388 Move AllObjectsJudged into ScoreProcessor as AllJudged
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
2017-09-12 22:01:08 +09:00
c5a20e3372 Remove permitNulls 2017-08-22 18:28:32 +09:00
803cbddfe2 Ensure score's user is set directly from API
Previously would fail in visualtests due to `OsuGame` case.
2017-08-22 16:59:54 +09:00
16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
e75f438c29 Add difficulty application mods
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
224de9cc1e Implement NoFail mod 2017-08-07 08:54:54 +09:00
df3f75b842 Merge branch 'master' into fixes 2017-07-31 17:51:34 +08:00
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
e0b1057b87 Merge branch 'master' into fixes 2017-07-24 20:50:33 +08:00
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-21 11:15:26 +02:00
ed6478be8b Merge branch 'master' into always-load-storyboard 2017-07-20 20:54:16 +02:00
c1a3e4a008 Remove unnecessary using 2017-07-20 20:06:24 +09:00
451f92772a Merge branch 'master' into fixes 2017-07-20 19:46:50 +09:00
3bdd4d7d02 Centralise TrackManager.AddItem logic to avoid duplicate adds 2017-07-20 17:46:33 +09:00
67b95926c4 Remove usage of SetExclusive
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
d6968ca09c Remove FullyLoaded logic
Always parse storyboards for now.

Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.
2017-07-20 11:01:50 +09:00
d69470f2ae Fix TestWorkingBeatmap broken by attempting to load storyboard 2017-07-20 09:22:39 +09:00
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
d75e439f94 Fix Player crashing due to null BeatmapInfo (now unused). 2017-07-20 01:27:27 +09:30
38431f8555 Fix remaining test case issues 2017-07-19 19:10:04 +09:00
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
d0dea33faa Make Beatmap (bindable) non-nullable. 2017-07-19 15:16:53 +09:00
cd7c04c54d Simplify misc null-coalescing expression. 2017-07-18 12:30:10 +08:00
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
54f6befd67 Merge branch 'master' into fix-track-rotation 2017-07-12 13:18:16 +09:00
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
9bbcc0526d Disable beatmap changes in specified screens 2017-07-11 18:39:10 +09:00
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