1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 01:03:02 +08:00
Commit Graph

54411 Commits

Author SHA1 Message Date
Bartłomiej Dach
f30d68cd4e
Merge pull request #19547 from peppy/editor-setup-no-state-change
Fix multiple cases of mutations at editor setup screen not triggering a state save
2022-08-16 22:19:12 +02:00
Bartłomiej Dach
1861f34427
Merge branch 'master' into editor-setup-no-state-change 2022-08-16 21:46:43 +02:00
Dan Balasescu
e689d4be96
Merge pull request #19530 from peppy/store-modified-time
Add `BeatmapInfo.LastUpdate` to track the time of local changes
2022-08-16 20:20:41 +09:00
Dan Balasescu
24fd411720
Merge pull request #19594 from BlauFx/improve_retry_behaviour
Skip song intro on quick restart
2022-08-16 20:18:12 +09:00
Dan Balasescu
57f48ca4d0
Merge pull request #19802 from peppy/improve-intro-timings
Improve intro timings when not using osu! theme
2022-08-16 20:07:16 +09:00
Dan Balasescu
0769cdf050
Merge pull request #19801 from peppy/fix-collection-reimport
Fix re-importing existing collections not correctly adding new items
2022-08-16 18:29:01 +09:00
Dean Herbert
5ac314077a Improve intro timings when not using osu! theme
Roughly as proposed in https://github.com/ppy/osu/discussions/19687.
2022-08-16 18:19:30 +09:00
Dean Herbert
1a7ddc0040 Fix re-importing existing collections not correctly adding new items 2022-08-16 16:43:05 +09:00
Dean Herbert
ee153a345c Add a few more overlooked beatmap save states on setup screen modifications 2022-08-16 16:31:56 +09:00
Dean Herbert
5238a5c115 Merge branch 'master' into editor-setup-no-state-change 2022-08-16 16:28:29 +09:00
Dean Herbert
11f38e539f Rename property to LastLocalUpdate 2022-08-16 16:01:19 +09:00
Dean Herbert
c7db4a532c Merge branch 'master' into store-modified-time 2022-08-16 15:53:51 +09:00
Dan Balasescu
26568f7ac9
Merge pull request #19796 from peppy/fix-player-loader-tests-volume-adjustment
Fix running `TestScenePlayerLoader` interactively leaving volume in a bad state
2022-08-16 14:52:15 +09:00
Dean Herbert
63819648df Fix up flow of actual skip operation 2022-08-16 14:40:02 +09:00
Dean Herbert
9a1a7bae89 Make test actually test things 2022-08-16 14:40:02 +09:00
Dean Herbert
6761f869f9 Modify flow to avoid weird bindable and value resetting 2022-08-16 14:17:35 +09:00
Dean Herbert
a15e6f19aa Fix running TestScenePlayerLoader interactively leaving volume in a bad state 2022-08-16 13:40:46 +09:00
Dean Herbert
c9baadcf88 Merge branch 'master' into improve_retry_behaviour 2022-08-16 13:06:04 +09:00
Bartłomiej Dach
adeabc632b
Merge pull request #19777 from peppy/even-nicer-frame-stability-clock
Tidy up and document `FrameStabilityContainer`
2022-08-15 17:06:59 +02:00
Dan Balasescu
a2c911990c
Merge branch 'master' into even-nicer-frame-stability-clock 2022-08-15 23:22:50 +09:00
Dan Balasescu
5a88f9c7ee
Merge pull request #19776 from peppy/even-less-gameplay-clock
Remove `FrameStableClock` (and redirect usages to `FrameStabilityContainer`)
2022-08-15 23:21:47 +09:00
Bartłomiej Dach
1ef8bb2367
Merge branch 'master' into even-less-gameplay-clock 2022-08-15 13:23:42 +02:00
Bartłomiej Dach
c334a84139
Merge pull request #19775 from peppy/less-gameplay-clock
Move all usage of `GameplayClock` to `IGameplayClock`
2022-08-15 13:23:04 +02:00
Dean Herbert
43442dbf65 Merge branch 'even-less-gameplay-clock' into even-nicer-frame-stability-clock 2022-08-15 20:22:30 +09:00
Dean Herbert
87760bbc06 Fix IsCatchingUp not being in correct state 2022-08-15 20:17:48 +09:00
Dean Herbert
1fc3d005c0 Seal FrameStabilityContainer
No one should ever derive from this class. It is already too complex.
2022-08-15 19:31:02 +09:00
Dean Herbert
fff2b57905 Tidy up and document FrameStabilityContainer 2022-08-15 19:28:12 +09:00
Dean Herbert
9bc2e91de0 Fix incorrect handling of reference clocks when no parent IGameplayClock is available 2022-08-15 19:19:19 +09:00
Dean Herbert
04d88b8216 Use constraint based assertions in TestSceneFrameStabilityContainer 2022-08-15 19:19:19 +09:00
Dean Herbert
828b6f2c30 Remove unnecessary setClock shenanigans 2022-08-15 19:19:19 +09:00
Dean Herbert
27569e2ed5 Remove FrameStableClock (and redirect usages to FrameStabilityContainer) 2022-08-15 19:19:19 +09:00
Bartłomiej Dach
71961b244e
Merge branch 'master' into less-gameplay-clock 2022-08-15 11:58:30 +02:00
Bartłomiej Dach
11854158a8
Merge pull request #19773 from peppy/constraint-asserts-in-tests
Update some clock tests to use constraint-based assertions
2022-08-15 11:57:43 +02:00
Dean Herbert
cc982d374c Cache self rather than GameplayClock 2022-08-15 18:30:53 +09:00
Dean Herbert
c5f8529d20 Mark unused methods as NotImplemented for safety 2022-08-15 18:30:53 +09:00
Dean Herbert
f81c7644b4 Make GameplayClockContainer also an IGameplayClock and expose to remaining tests 2022-08-15 18:30:53 +09:00
Dean Herbert
c8764cb333 Move all usage of GameplayClock to IGameplayClock 2022-08-15 18:30:53 +09:00
Dean Herbert
6d78218142 Update usages of GameplayClockContainer.GameplayClock to access properties directly 2022-08-15 18:08:49 +09:00
Dean Herbert
224f3eaa84 Make GameplayClockContainer non-abstract and use in MultiSpectatorPlayer 2022-08-15 18:08:49 +09:00
Dean Herbert
95c1b488a7 Add non-null assertion to FrameStabilityContainer 2022-08-15 18:08:49 +09:00
Dean Herbert
58146598c8 Update TestSceneEditorClock to use constraint-based assertions 2022-08-15 18:08:05 +09:00
Dean Herbert
0087935708 Update TestSceneSpinnerRotation to use constraint-based assertions 2022-08-15 18:05:39 +09:00
Dan Balasescu
4b5439f434
Merge pull request #19768 from peppy/fix-song-progress-div-by-zero
Fix div-by-zero in `SongProgress` when no object duration could be calculated
2022-08-15 16:44:28 +09:00
Dean Herbert
623e90a7b2 Fix div-by-zero in SongProgress when no object duration could be calculated 2022-08-15 15:05:35 +09:00
Bartłomiej Dach
05ddfe7522
Merge branch 'master' into editor-setup-no-state-change 2022-08-14 18:21:31 +02:00
Dean Herbert
0d3cda3329
Merge pull request #19746 from bastianpedersen/beatmap-comments-image-not-visible
Make `CommentMarkdownTextFlowContainer` render images
2022-08-15 00:02:03 +09:00
basseX
383afe04f3 Remove not needed override 2022-08-14 15:15:36 +02:00
basseX
932becc4b2 Remove CommentMarkdownTextFlowContainer and rather use base-class OsuMarkdownTextFlowContainer 2022-08-14 10:11:49 +02:00
basseX
b05acb0073 Make CommentMarkdownTextFlowContainer render images 2022-08-13 21:32:24 +02:00
Dan Balasescu
c02990ad67
Merge pull request #19718 from peppy/fix-playlist-imported-items
Fix playlist overlay showing new imports when they don't match collection filter
2022-08-12 23:27:26 +09:00