Commit Graph

49 Commits

Author SHA1 Message Date
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
13f88cbc4e Fix EditorClock retaining a reference to potentially outdated ControlPointInfo 2021-09-14 23:56:57 +09:00
78f9f4a230 Move time clamp to Seek/transformSeekTo methods 2021-08-16 20:39:09 +02:00
d287db7961 Clamping seekTime to beatmap length 2021-08-15 14:48:56 +02:00
4df7ff21c7 Fix editor arrow seek snapping not updating after control point changes
The editor clock, which is responsible for performing the seek, was not
aware of changes in control points due to reading from the wrong
beatmap. `loadableBeatmap` is not actually changed by any of the editor
components; `playableBeatmap` and `editorBeatmap` are.

For now this is changed to use `playableBeatmap`. A better follow-up
would be to use `editorBeatmap`, but it would probably be best to move
the beat snap bindable into `EditorBeatmap` first.
2021-04-03 14:02:46 +02:00
b9761c8196 Further simplify logic 2021-03-18 16:20:31 -07:00
df6570ebf5 Improve logic and add previously failing test
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-17 15:48:55 -07:00
a691291ae8 Merge branch 'master' into editor-song-end 2021-03-17 18:18:19 +01:00
831c06a3c7 Expose and consume boolean covering whether an ongoing smooth seek is running 2021-01-15 16:14:38 +09:00
04fa32bc34 Rename and add xmldoc for smooth seeking method 2021-01-15 16:14:21 +09:00
3956a0669a Fix editor seek transform seeking too much 2020-11-02 21:08:58 +09:00
e0ad005cc1 Move editor sample disabling logic to editor class (and support screen switching) 2020-10-27 14:33:44 +09:00
b1a64f89d7 Increase backwards seek magnitude when the track is running
This matches osu-stable. When the track is running, seeking backwards
(against the flow) is harder than seeking forwards. Adding a mutliplier
makes it feel much better.

Note that this is additive not multiplicative because for larger seeks
the (where `amount` > 1) we don't want to jump an insanely huge amount -
just offset the seek slightly to account for playing audio.
2020-10-06 17:53:12 +09:00
d6f3beffb6 Use existing bindable flow instead 2020-09-29 12:50:17 +09:00
585b857a0c Handle paused state correctly 2020-09-29 12:17:38 +09:00
4f0c0ea5f9 Fix hit samples playing while paused / seeking in the editor 2020-09-28 18:17:47 +09:00
7e7e2fd64a Use bindable for track to fix rate adjustments not applying correctly 2020-09-24 20:56:35 +09:00
978f6edf38 Add basic track reloading support while inside the editor 2020-09-24 20:56:35 +09:00
039790ce4f Perform next timing point check before ensuring movement 2020-07-17 16:40:02 +09:00
e96e558728 Fix reversing scroll direction not always behaving as expected 2020-07-17 16:03:23 +09:00
12d65f305f Simplify and fix incorrect seeking 2020-05-22 22:11:55 +09:00
1486a44b55 Merge branch 'editor-clock-cache' into editor-clock-transform 2020-05-22 19:51:02 +09:00
866db629d6 Fix remaining test failures 2020-05-22 18:23:24 +09:00
d18eb663b1 Add tweening seek support to EditorClock 2020-05-22 16:47:52 +09:00
b41f3f1cad Fix seeking back to beginning too early 2020-03-23 22:37:53 -07:00
7e4f58c2d3 Internalize both looping and stopping 2020-03-13 16:42:05 -07:00
1d314a1f4b Prevent playback from going beyond song end 2020-03-11 22:40:08 -07:00
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
7f2916454d Simplify EditorClock.Seek method 2019-10-30 19:09:46 +09:00
45af796943 Remove usages of EF internals 2019-10-30 17:05:15 +09:00
e987db37ec Add grouping of ControlPoints 2019-10-25 19:52:02 +09:00
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
0ee5a5bdb4 Add support for keyboard seeking in the editor 2018-11-30 14:57:25 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
52f4923c8e Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
a54bda6ce1 Apply requested changes 2018-05-21 13:23:39 +03:00
2a90686da6 Simplify expression 2018-05-12 15:09:53 +03:00
e44062b77a Fix tests and implementation 2018-05-08 16:37:06 +03:00
dd9b9a18ac Prevent user from scrolling outside the timeline in the editor 2018-05-08 16:21:54 +03:00
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
127f0d7b01 Fix smoogipoo's comments 2018-04-12 21:17:17 +09:00
0ca703beaa Add some missing xmldoc 2018-04-12 21:04:45 +09:00
e59124962c Remove re-instantiation of clock in EditorClockTestCase 2018-04-06 18:38:44 +09:00
c7abd56fc4 Give editor a custom clock to handle seeking 2018-04-06 18:11:37 +09:00