1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 20:02:54 +08:00
Commit Graph

55474 Commits

Author SHA1 Message Date
Dean Herbert
03dcfed384
Merge branch 'master' into slider-splitter 2022-08-26 19:10:33 +09:00
Dean Herbert
47cb163015 Refactor splitting logic and comments slightly 2022-08-26 19:09:03 +09:00
Dean Herbert
f54047d17b Move selection clearing to top 2022-08-26 18:55:20 +09:00
Dean Herbert
9c9238d6e8 Fix TimelineTestScene's beatmap getting overwritten by EditorClockTestScene 2022-08-26 18:38:52 +09:00
Dean Herbert
cd90536e4b Remove Track access in Timeline 2022-08-26 18:25:48 +09:00
Dean Herbert
4b72e55770 Fix various test scenes not adding EditorClock to the draw hierarchy 2022-08-26 18:08:43 +09:00
Dean Herbert
12d6d6793c Move EditorClock processing to Update and always decouple 2022-08-26 18:08:43 +09:00
nanashi-1
78717956d5 add visual test 2022-08-26 16:55:18 +08:00
Dean Herbert
fec744a7fe Add global FramedBeatmapClock for BeatSyncProvider components 2022-08-26 17:48:21 +09:00
Dean Herbert
31e459364b Use FramedBeatmapClock in EditorClock 2022-08-26 17:28:58 +09:00
Dean Herbert
9050f54681 Split out test assertion methods to read better 2022-08-26 16:56:03 +09:00
Dean Herbert
ed0843aa84 Reword xmldoc regarding final clock source to read better 2022-08-26 16:46:22 +09:00
nanashi
0b4d1fd3c0
Merge branch 'ppy:master' into merge-hitobject-hitsound-fix 2022-08-26 15:20:30 +08:00
Dean Herbert
2c780eab5f Merge branch 'master' into fix_progress_bar_info 2022-08-26 16:14:21 +09:00
Dean Herbert
a40355186a Tidy up constructor field initialisation 2022-08-26 16:00:20 +09:00
Dean Herbert
23efec6505 Fix naming and comment typos 2022-08-26 15:57:36 +09:00
Dean Herbert
9862b79b47 Fix typo in long comment 2022-08-26 15:20:09 +09:00
MBmasher
d8854413cb Add newline 2022-08-26 12:38:36 +10:00
MBmasher
6651e76e2e Remove whitespace 2022-08-26 12:37:56 +10:00
MBmasher
b0e7f63361 Update angle multiplier to nerf repeated angles 2022-08-26 12:34:33 +10:00
HiddenNode
d98357aa57 Made text inside SongProgressInfo scale. 2022-08-26 01:30:44 +01:00
HiddenNode
29f3724047 Changed UprightUnscaledContainer to UprightUnstretchedContainer. 2022-08-26 01:28:57 +01:00
Salman Ahmed
0d6b7fde92
Merge pull request #19940 from smoogipoo/legacy-combo-increase
Add `legacy_combo_increase` hit result type for legacy scores
2022-08-25 16:17:35 +03:00
Dean Herbert
a260d7872d Update framework 2022-08-25 21:50:10 +09:00
Salman Ahmed
dad4946481
Merge branch 'master' into legacy-combo-increase 2022-08-25 15:44:08 +03:00
Dean Herbert
a546aa2673 Clamp SpectatorPlayerClock's elapsed calculation to avoid player clocks getting too far ahead 2022-08-25 21:33:33 +09:00
nanashi
4fc96f0389
Merge branch 'ppy:master' into merge-hitobject-hitsound-fix 2022-08-25 19:34:05 +08:00
nanashi-1
16fee7ac1c add visual test 2022-08-25 19:31:47 +08:00
Dean Herbert
ae38c9e58d Update framework 2022-08-25 19:18:17 +09:00
Dean Herbert
510d9ac79f Merge branch 'master' into text-selection-sfx 2022-08-25 19:18:14 +09:00
nanashi-1
2d2bfac5e9 used firstHitObject.Samples as samples for mergedHitObject 2022-08-25 17:49:38 +08:00
Dean Herbert
a8c699610a Fix lead in tests not waiting for player to start running
The tests are only meant to ensure that gameplay eventually starts.

The case where failures can occur is where the master clock is behind
the player clock (due to being in lead-in time). Because the test is
running in real-time, it can take arbitrary amounts of time to catch up.

If it took too long, the test would fail.
2022-08-25 18:00:14 +09:00
Dean Herbert
ddb434f47a Rename asserts to method names to make it easier to track in logs 2022-08-25 17:30:13 +09:00
Dan Balasescu
9bca7223f6 Adjust xmldoc to better explain score contribution 2022-08-25 17:16:30 +09:00
Dan Balasescu
e2e10a8f26 Add some explanatory comments to conditions 2022-08-25 17:14:53 +09:00
Dean Herbert
a5c61d9a52 Improve understandability of TestMostInSyncUserIsAudioSource 2022-08-25 16:47:33 +09:00
Dean Herbert
a68c71b34f
Merge pull request #19959 from peppy/fix-slider-path-version-runaway
Fix `SliderPath.Version` bindings not being correctly cleaned up on path changes
2022-08-25 16:32:34 +09:00
Dean Herbert
3a17c6df08 Merge branch 'master' into no-gameplay-clock-gameplay-offset 2022-08-25 16:24:55 +09:00
Salman Ahmed
6840e906e7 watchedUsers -> watchedUsersRefCounts 2022-08-25 09:50:52 +03:00
Salman Ahmed
eb57ea76ab
Merge branch 'master' into legacy-combo-increase 2022-08-25 09:46:12 +03:00
Salman Ahmed
bb0701c457
Merge pull request #19939 from smoogipoo/maximum-statistics-2
Add `maximum_statistics` to `ScoreInfo`
2022-08-25 09:45:33 +03:00
Dean Herbert
3ca4bdc087 Add ToArray() calls to removal iteration for safety 2022-08-25 15:13:38 +09:00
Dean Herbert
091c51e664 Fix SliderPath.Version bindings not being correctly cleaned up on path changes 2022-08-25 15:00:32 +09:00
Dan Balasescu
3ac8b6779b
Merge branch 'master' into maximum-statistics-2 2022-08-25 14:53:18 +09:00
Dan Balasescu
bf43f1d076
Merge pull request #19956 from peppy/fix-beatmap-carousel-interactive-test-run
Fix some `BeatmapCarousel` tests not correctly reinitialising local data per run
2022-08-25 14:52:22 +09:00
Dean Herbert
a6ed589db4 Remove guard against RemoveFilters running more than once
It turns out this is required to remove some filters immediate, and some
later. Weird.
2022-08-25 14:47:33 +09:00
Dean Herbert
ad3dd1c700 Fix a couple of oversights regarding track nullability 2022-08-25 14:45:00 +09:00
Dan Balasescu
85705d97a5
Merge pull request #19853 from Lawtrohux/pp-rescale-effective-misses
osu!taiko performance point adjustments & effective misses
2022-08-25 14:43:03 +09:00
Dean Herbert
ec60e16439 Apply NRT to FailAnimation 2022-08-25 14:35:42 +09:00
Dean Herbert
8f4a953d11 Ensure fail animation sequence isn't run after the player exit sequence has started 2022-08-25 14:26:42 +09:00