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

54746 Commits

Author SHA1 Message Date
Dan Balasescu
17a12807de
Merge branch 'master' into framework-ini-in-sentry 2022-08-26 21:30:07 +09:00
Dan Balasescu
91e044542d
Merge pull request #19828 from peppy/no-gameplay-clock-gameplay-offset
Introduce `FramedBeatmapClock` (and use in gameplay flow)
2022-08-26 20:21:34 +09:00
Dean Herbert
69cbc0125b
Merge pull request #19964 from nanashi-1/merge-hitobject-hitsound-fix
Fix hitobjects merge feature in editor not adding any hitsounds
2022-08-26 20:05:02 +09:00
Dean Herbert
9e3659b2d2
Merge pull request #19858 from OliBomby/slider-splitter
Add ability to split sliders in osu! editor
2022-08-26 19:43:03 +09:00
Dean Herbert
cb1c4a1bb1 Move sample checks to be inline in other existing tests 2022-08-26 19:18:15 +09:00
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
nanashi-1
78717956d5 add visual test 2022-08-26 16:55:18 +08: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
9862b79b47 Fix typo in long comment 2022-08-26 15:20:09 +09: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
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
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
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
Salman Ahmed
146cc62f00
Merge branch 'master' into maximum-statistics-2 2022-08-25 08:18:44 +03:00
Dean Herbert
1032b2a68c Fix some BeatmapCarousel tests not correctly reinitialising local data per run
Closes https://github.com/ppy/osu/issues/19949.
2022-08-25 14:03:26 +09:00
Dan Balasescu
8eab36f8c9 Actually fix possible NaN value 2022-08-25 14:02:10 +09:00
Dan Balasescu
17029f0b92 Ensure clones don't reference to MaximumStatistics 2022-08-25 13:58:58 +09:00
Dan Balasescu
136dcee3b5
Merge pull request #19571 from vunyunt/colour-encoding-2
Rewrite of the colour skill & refactoring of difficulty calculation within osu!taiko
2022-08-25 13:56:50 +09:00
Dan Balasescu
73f41439ae Remove redundant qualifiers 2022-08-25 13:34:58 +09:00
Dean Herbert
804a752062
Merge pull request #19951 from o-dasher/no-mod-gameplayclock
No "gameplayClock" usage with playfield update mods
2022-08-25 11:14:22 +09:00
o-dasher
4de6df71c5 No "gameplayClock" usage with playfield update mods 2022-08-24 20:59:32 -04:00
Bartłomiej Dach
55f1865c03
Merge pull request #19937 from novialriptide/copyexternalurl-dialog
Add option to copy URL rather than open an external link
2022-08-24 21:55:41 +02:00
Bartłomiej Dach
968f656585
Merge branch 'master' into copyexternalurl-dialog 2022-08-24 21:21:11 +02:00
Dan Balasescu
e7cbb6c63d Fix test failures/nullability 2022-08-24 19:53:16 +09:00
Dan Balasescu
c9ff39f8c3 Add HitResult.LegacyComboIncrease 2022-08-24 19:46:41 +09:00
Dan Balasescu
5ec95c9269 Update ScoreProcessor to make use of MaximumStatistics 2022-08-24 19:46:41 +09:00
Dean Herbert
2af8c4a2ea
Merge pull request #19904 from novialriptide/add-date-created-sort
Add date submitted sorting
2022-08-24 17:43:28 +09:00
Dean Herbert
6a0d23cf96 Nest dialog class and apply NRT 2022-08-24 17:39:22 +09:00
Dean Herbert
9f9deef438 Reword slightly 2022-08-24 17:37:41 +09:00