1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 15:17:52 +08:00
Commit Graph

54505 Commits

Author SHA1 Message Date
Dean Herbert
489e172a76 Simplify track start/stop/paused tracking 2022-08-22 19:43:18 +09:00
Dean Herbert
e6b669db8e Elaborate with example of GameplayClockContainer managing its own Stop state 2022-08-22 14:14:44 +09:00
Dean Herbert
af2e82d7d5 Move operation of setting GameplayClockContainer.StartTime to Reset call 2022-08-22 14:11:06 +09:00
Dean Herbert
17a1df281c Fix incorrect implicit null specification for user audio offset bindable 2022-08-22 14:03:51 +09:00
Dean Herbert
ba23ce75c2 Make FramedBeatmapClock.Track non-null 2022-08-22 14:02:41 +09:00
Dean Herbert
85d0b7fc57 Reword class xmldoc to better explain that offset application is optional 2022-08-22 14:02:20 +09:00
Dean Herbert
339f0b0cd2 Merge branch 'master' into no-gameplay-clock-gameplay-offset 2022-08-19 23:01:09 +09:00
Dan Balasescu
4ef8e00a78
Merge pull request #19851 from peppy/update-framework
Update framework and resources
2022-08-19 22:03:55 +09:00
Dean Herbert
7bf318541c Reword comment to hopefully read better 2022-08-19 20:57:55 +09:00
Dean Herbert
c3c44c19cd Use CompositeComponent in various locations 2022-08-19 20:43:15 +09:00
Dean Herbert
41321521e5 Update resources 2022-08-19 20:40:05 +09:00
Dean Herbert
426c4c9bf7 Update framework 2022-08-19 20:39:53 +09:00
Dean Herbert
3f0da14065 Delay start operation by one frame to allow children to see initial start time 2022-08-19 17:39:51 +09:00
Dean Herbert
e7d4962128
Merge branch 'master' into no-gameplay-clock-gameplay-offset 2022-08-19 01:50:14 +09:00
Dean Herbert
3eb1cda6aa Reorganise call order of Start / Reset to make more sense 2022-08-19 01:46:36 +09:00
Dean Herbert
15d49b0357 Update TestSceneSpectator to user new assert style 2022-08-19 01:46:19 +09:00
Dean Herbert
1d774f3f12 Remove redundant ProcessFrame calls
Of note, I'm not sure whether the `IsPaused` check was meaningful, but
it's not reimplemented in the new `FramedBeatmapClock`.
2022-08-19 01:39:02 +09:00
Dean Herbert
7bc96431a7 Remove unnecessary virtual spec from GameplayClockContainer.Seek 2022-08-19 01:39:01 +09:00
Dean Herbert
0e228791c0 Remove unnecessary Reset call in MultiSpectatorScreen 2022-08-19 01:39:01 +09:00
Dean Herbert
cc86909633 Increase lenience on TestSceneLeadIn tests
I've gone through these in detail and can't find an issue with the
actual flow of things. For whatever reason, the new structure has a
slightly higher delay, likely due to performing less `Seek` calls
(previously a `Seek` was called after the clock start which may have
been making this more accurate on the first `Player.Update`).

I don't think it really matters that this is slightly off, but we'll see
how this plays out.
2022-08-19 01:39:00 +09:00
Bartłomiej Dach
bc851c174b
Merge pull request #19836 from peppy/split-offset-clock
Split `OffsetCorrectionClock` out of `MasterGameplayClockContainer`
2022-08-18 18:26:51 +02:00
Bartłomiej Dach
4ad782b5a0
Merge branch 'master' into split-offset-clock 2022-08-18 17:52:45 +02:00
Dean Herbert
0f0b4fdfec
Merge pull request #19838 from peppy/test-scene-lead-in-updates
Update `TestSceneLeadIn` to use new assert style
2022-08-18 20:55:55 +09:00
Dean Herbert
2eba8650ca Update TestSceneLeadIn to use new assert style 2022-08-18 19:26:19 +09:00
Dean Herbert
43879633db Ensure setting a StartTime on a GameplayClockContainer always resets to the new time 2022-08-18 18:54:10 +09:00
Dean Herbert
343efa1d11 Split OffsetCorrectionClock out of MasterGameplayClockContainer 2022-08-18 18:54:10 +09:00
Dean Herbert
2c6fd1ec6e Fix `GameplayClockContainer potentially resetting external seeks 2022-08-18 18:54:10 +09:00
Dean Herbert
728cd96508 Update TestSceneLeadIn to use new assert style 2022-08-18 18:54:10 +09:00
Dean Herbert
bcc153f738 Add xmldoc and reorganise FramedBeatmapClock 2022-08-18 18:54:10 +09:00
Dean Herbert
6003afafc7 Use FramedBeatmapClock in GameplayClockContainer 2022-08-18 18:54:10 +09:00
Dean Herbert
32e127a6fa Add FramedBeatmapClock
Expose `IsCoupled` in `FramedBeatmapClock` for now to provide editor compatibility
2022-08-18 18:54:10 +09:00
Dan Balasescu
fa167b1d12
Merge pull request #19779 from peppy/no-gameplay-clock
Remove all remaining usage of `GameplayClock`
2022-08-18 18:52:57 +09:00
Dean Herbert
3e34959a6e
Merge pull request #19833 from smoogipoo/fix-backwards-asserts
Fix some backwards asserts
2022-08-18 18:42:23 +09:00
Dan Balasescu
5d8d584afb Fix some backwards asserts 2022-08-18 18:08:46 +09:00
Dan Balasescu
c4dee1cf6d
Merge pull request #19832 from peppy/fix-taiko-span-blueprint-overlay
Fix taiko blueprints displaying incorrectly for drum rolls
2022-08-18 17:57:14 +09:00
Dan Balasescu
8480703e0b
Merge pull request #19831 from peppy/fix-zero-length-taiko-spans
Fix taiko drum rolls with zero length being placeable in editor
2022-08-18 17:56:46 +09:00
Dean Herbert
ad28bfc9b2 Fix taiko blueprints displaying incorrectly for drum rolls 2022-08-18 17:18:11 +09:00
Dean Herbert
48fac9f8a5 Fix taiko drum rolls with zero length being placeable in editor
Addresses https://github.com/ppy/osu/discussions/19808.
2022-08-18 16:50:36 +09:00
Dean Herbert
8d026eeeea
Merge pull request #19827 from smoogipoo/upgrade-analyser
Upgrade LocalisationAnalyser and disable warning
2022-08-18 16:35:34 +09:00
Dan Balasescu
e55b94d412 Also upgrade tools 2022-08-18 15:18:35 +09:00
Dan Balasescu
7512c126b7 Upgrade LocalisationAnalyser and disable warning 2022-08-18 15:08:24 +09:00
Dean Herbert
9735728cf6 Reverse conditionals to better define intent in addSourceClockAdjustments 2022-08-18 15:08:09 +09:00
Dan Balasescu
7878231a73
Merge pull request #19817 from peppy/various-test-fixes
Refactor some tests
2022-08-18 14:39:43 +09:00
Dean Herbert
d40d09a544 Rename method to be more specific and standardise setBeatmap calls 2022-08-17 23:03:39 +09:00
Dean Herbert
e7ddbc41c8
Merge branch 'master' into no-gameplay-clock 2022-08-17 22:21:10 +09:00
Dan Balasescu
4627e4f53b
Merge pull request #19120 from molneya/mania-note-order-fix
Fix mania star rating varying by order of notes in a chord
2022-08-17 20:39:52 +09:00
Dan Balasescu
11301f52b7
Merge pull request #19814 from peppy/update-framework
Update framework (and other dependencies)
2022-08-17 19:24:01 +09:00
Dean Herbert
553ae4781f Remove unnecessary local implementation in TestScenePlaybackControl 2022-08-17 19:21:54 +09:00
Dean Herbert
7d8fbc4dbc Refactor TestSceneDrawableTaikoMascot to read a bit better 2022-08-17 19:21:50 +09:00
Dean Herbert
4ef4d66f49 Add some extra initial state checks to TestSceneEditorSeekSnapping 2022-08-17 19:21:46 +09:00