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

55742 Commits

Author SHA1 Message Date
Salman Ahmed
81c0a641b4 Fix selection fallback path not updated to check inserted indices 2022-08-26 14:51:08 +03:00
HiddenNode
24edffcbc4 Moved ScaleMode to UprightAspectMaintainingContainer.cs 2022-08-26 12:47:12 +01:00
Salman Ahmed
f38194fb40 Merge branch 'master' into carousel-maintain-selection-over-update 2022-08-26 14:35:19 +03:00
Dean Herbert
6dc859973b
Merge branch 'master' into fix-playlist-overlay-test-failures 2022-08-26 20:25:53 +09:00
Dan Balasescu
35d262fc5d
Merge branch 'master' into no-gameplay-clock-beat-synced-container 2022-08-26 20:25:23 +09:00
Dean Herbert
90ff0864c0
Merge branch 'master' into no-gameplay-clock-editor-offset 2022-08-26 20:25:21 +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
MBmasher
454d868dd5 Remove unnecessary using call 2022-08-26 20:42:02 +10:00
MBmasher
249c3f868f Compare raw angle values instead of rounding angles 2022-08-26 20:40:18 +10:00
MBmasher
5082ee26cf Ensure a negative value cannot be added to angleRepeatCount 2022-08-26 20:30:14 +10:00
MBmasher
08cb70b093 Lessen repeated angle nerf for objects further back in time 2022-08-26 20:27:31 +10:00
Dean Herbert
d6359b00ad Fix filename mismatch 2022-08-26 19:20:36 +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
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