Commit Graph

765 Commits

Author SHA1 Message Date
4b21c83f35 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-11-10 17:24:26 +03:00
bc54d4dd4f Ensure we wait for audio track reset before proceeding with player execution 2017-11-10 18:32:15 +09:00
6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
7a72f2e3f5 Make sure we restore the clock rate on exiting 2017-10-14 05:15:18 +03:00
0ec7d2dcf6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-06 15:56:08 +03:00
feb0b1852f Remove the dangerous function 2017-10-03 20:05:50 +03:00
b6ed977e1e Fix hard crash and fix breaks have been initialized twice 2017-10-02 09:04:03 +03:00
6d97da8b19 Add replay speed adjustment 2017-10-02 04:42:38 +03:00
3cd6319ffa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-27 00:32:38 +03:00
2d4616fd43 Apply beatmap settings when creating the DrawableStoryboard. 2017-09-25 11:03:57 +02:00
0996867112 Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard. 2017-09-25 10:40:22 +02:00
2da3ea00b6 Bind break overlay to accuracy 2017-09-23 16:42:18 +03:00
18a714df74 Move every class to it's own file 2017-09-20 22:33:07 +03:00
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
757a159516 Display a non-parallax background at the appropriate size when storyboards do not replace it. 2017-09-15 14:31:54 +02:00
f5368505ab Load the storyboard asynchronously if it wasn't loaded with the beatmap. 2017-09-15 11:58:37 +02:00
4a15762139 Don't create drawables for hidden storyboards. 2017-09-15 11:58:37 +02:00
c8cdf6787e Better property name. 2017-09-15 11:58:31 +02:00
7c3ce7e830 Unbind events affecting the background after gameplay has ended. 2017-09-15 09:16:56 +02:00
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