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

55270 Commits

Author SHA1 Message Date
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
Salman Ahmed
a3e595a9aa Update comment to include inserted indices 2022-08-26 14:51:19 +03:00
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