1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Commit Graph

54785 Commits

Author SHA1 Message Date
OliBomby
16e0ec2f88 Fixed 0 length merge being allowed 2022-08-27 13:53:50 +02:00
Dan Balasescu
cf6bb3b030
Merge pull request #19958 from peppy/fix-fail-freq-stuck
Ensure fail animation sequence isn't run after the player exit sequence has started
2022-08-27 00:58:41 +09:00
Dean Herbert
35f0273c8a
Merge pull request #19850 from nekodex/text-selection-sfx
Add audio feedback for text selection
2022-08-27 00:54:28 +09:00
Salman Ahmed
764ab9f095
Merge branch 'master' into text-selection-sfx 2022-08-26 17:50:03 +03:00
Dan Balasescu
289b6f1a58
Merge pull request #19924 from peppy/fix-playlist-overlay-test-failures
Fix intermittent test failures in `TestScenePlaylistOverlay`
2022-08-26 23:36:16 +09:00
Dean Herbert
470bec7949 Move private method down 2022-08-26 23:29:03 +09:00
Dean Herbert
9c64520f8f
Merge pull request #19909 from peppy/framework-ini-in-sentry
Include framework configuration in sentry output
2022-08-26 23:13:26 +09:00
Dan Balasescu
8b871dab28
Merge pull request #19203 from tsunyoku/mod-validation-tests
Ensure all mods are incompatible in both ways
2022-08-26 23:01:51 +09:00
Dean Herbert
e4100ee3f1
Merge branch 'master' into text-selection-sfx 2022-08-26 22:05:32 +09:00
Dean Herbert
b9d9bf3004
Merge pull request #19938 from frenzibyte/fix-multi-spectator-results-screen
Fix multi-spectator potentially getting stuck for passed players
2022-08-26 21:53:17 +09:00
Dan Balasescu
17a12807de
Merge branch 'master' into framework-ini-in-sentry 2022-08-26 21:30:07 +09:00
Salman Ahmed
1fd1672d89
Merge branch 'master' into mod-validation-tests 2022-08-26 15:00:07 +03:00
Dean Herbert
6dc859973b
Merge branch 'master' into fix-playlist-overlay-test-failures 2022-08-26 20:25:53 +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
5ef8e26ebe Fix check not accounting for mods not existing in certain rulesets
Also check all instances, rather than first.
2022-08-26 19:59:26 +09:00
Dean Herbert
580754833f Merge branch 'master' into mod-validation-tests 2022-08-26 19:48:42 +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
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