1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-20 01:32:56 +08:00
Commit Graph

55774 Commits

Author SHA1 Message Date
Dan Balasescu
11301f52b7
Merge pull request #19814 from peppy/update-framework
Update framework (and other dependencies)
2022-08-17 19:24:01 +09:00
Dean Herbert
553ae4781f Remove unnecessary local implementation in TestScenePlaybackControl 2022-08-17 19:21:54 +09:00
Dean Herbert
7d8fbc4dbc Refactor TestSceneDrawableTaikoMascot to read a bit better 2022-08-17 19:21:50 +09:00
Dean Herbert
4ef4d66f49 Add some extra initial state checks to TestSceneEditorSeekSnapping 2022-08-17 19:21:46 +09:00
Dan Balasescu
f381bc9115 Add explanatory comment 2022-08-17 19:03:48 +09:00
Dan Balasescu
203b8b22b9 Adjust tests 2022-08-17 19:02:16 +09:00
Dan Balasescu
237637f0c4
Merge pull request #19804 from stanriders/clamp-sb-estimation
Clamp effective miss count to maximum amount of possible breaks
2022-08-17 18:58:12 +09:00
Dean Herbert
e1e6be039a Don't create destination stream if backup source doesn't exist 2022-08-17 18:20:47 +09:00
Dean Herbert
eb9cfe97d2
Merge pull request #19815 from smoogipoo/fix-quick-retry-test
Fix flaky quick retry test
2022-08-17 17:43:31 +09:00
Dean Herbert
fca076b988 Fix edge case of realm backup cascading failure 2022-08-17 17:17:22 +09:00
Dean Herbert
243fe56b1d Realm bump for props 2022-08-17 17:11:17 +09:00
Dan Balasescu
3a0017c87b Fix flaky quick retry test 2022-08-17 17:09:44 +09:00
Josh
a23095ba0f
Merge branch 'master' into master 2022-08-17 16:02:23 +08:00
Dean Herbert
a5ac69a554 Update various dependencies 2022-08-17 16:57:56 +09:00
Dean Herbert
7191fbb6d6 Update framework 2022-08-17 16:40:07 +09:00
Dean Herbert
c3b3733307
Merge pull request #19782 from OliBomby/slider-merger
Add ability to merge hit objects in osu! editor to create sliders
2022-08-17 15:52:16 +09:00
Dan Balasescu
0cf3c5570a
Merge pull request #19800 from peppy/fix-editor-ear-rape
Fix slider ticks playing back at infinite rate while making changes to a slider in the editor
2022-08-17 15:50:58 +09:00
Dan Balasescu
aaaaff1bbf
Merge pull request #19812 from peppy/improve-intro-timings-2
Tweak intro timings more and ensure non-theme tracks play from preview point
2022-08-17 15:50:42 +09:00
Dean Herbert
20256aad11 Merge branch 'master' into no-gameplay-clock 2022-08-17 15:21:20 +09:00
Dean Herbert
21b364cd77 Fix nullref in tests as initialBeatmap may be null 2022-08-17 14:48:00 +09:00
Dean Herbert
6b9dec5996 Restore original event flow to allow for OnSuspend case to work correctly 2022-08-17 14:32:21 +09:00
Dean Herbert
8ce50e98a6 Move delegate debounce logic to Editor itself 2022-08-17 14:04:57 +09:00
Dan Balasescu
8b5ac55fca
Remove newline 2022-08-17 13:48:06 +09:00
Dean Herbert
615c5cf6ae
Merge branch 'master' into slider-merger 2022-08-17 13:36:15 +09:00
Dean Herbert
0ff5547b83 Make changeHandler optional in convertToStream method to match new implementation 2022-08-17 13:35:44 +09:00
Dean Herbert
d9346abb9c Tweak intro timings more and ensure non-theme tracks play from preview point 2022-08-17 13:20:40 +09:00
Dean Herbert
37799e3b31 Allow preparing preview point without looping 2022-08-17 13:20:24 +09:00
OliBomby
d021218d78 added test for objects which cant be merged 2022-08-16 23:05:35 +02:00
Bartłomiej Dach
3109066e34
Rename {Requires -> Pending}Configuration 2022-08-16 22:45:24 +02:00
Bartłomiej Dach
6bfdfeb153
Refactor mod panel selection logic to avoid overwriting 2022-08-16 22:41:35 +02:00
Bartłomiej Dach
f30d68cd4e
Merge pull request #19547 from peppy/editor-setup-no-state-change
Fix multiple cases of mutations at editor setup screen not triggering a state save
2022-08-16 22:19:12 +02:00
Bartłomiej Dach
1861f34427
Merge branch 'master' into editor-setup-no-state-change 2022-08-16 21:46:43 +02:00
StanR
43e471c2a5 Clamp effective miss count to maximum amount of possible braks 2022-08-16 16:12:13 +03:00
Dan Balasescu
e689d4be96
Merge pull request #19530 from peppy/store-modified-time
Add `BeatmapInfo.LastUpdate` to track the time of local changes
2022-08-16 20:20:41 +09:00
Dan Balasescu
24fd411720
Merge pull request #19594 from BlauFx/improve_retry_behaviour
Skip song intro on quick restart
2022-08-16 20:18:12 +09:00
Dan Balasescu
57f48ca4d0
Merge pull request #19802 from peppy/improve-intro-timings
Improve intro timings when not using osu! theme
2022-08-16 20:07:16 +09:00
Dan Balasescu
0769cdf050
Merge pull request #19801 from peppy/fix-collection-reimport
Fix re-importing existing collections not correctly adding new items
2022-08-16 18:29:01 +09:00
Dean Herbert
5ac314077a Improve intro timings when not using osu! theme
Roughly as proposed in https://github.com/ppy/osu/discussions/19687.
2022-08-16 18:19:30 +09:00
Dean Herbert
1a7ddc0040 Fix re-importing existing collections not correctly adding new items 2022-08-16 16:43:05 +09:00
Dean Herbert
ee153a345c Add a few more overlooked beatmap save states on setup screen modifications 2022-08-16 16:31:56 +09:00
Dean Herbert
5238a5c115 Merge branch 'master' into editor-setup-no-state-change 2022-08-16 16:28:29 +09:00
Dean Herbert
9d2c2b71cf Change conditional to check for insertions in addition to modifications
It is possible that the import process itself marks the previous
beatmaps as deleted due to an overlap in metadata or otherwise.
2022-08-16 16:21:36 +09:00
Dean Herbert
c8fdfd298c Merge branch 'master' into carousel-maintain-selection-over-update 2022-08-16 16:04:32 +09:00
Dean Herbert
11f38e539f Rename property to LastLocalUpdate 2022-08-16 16:01:19 +09:00
Dean Herbert
c7db4a532c Merge branch 'master' into store-modified-time 2022-08-16 15:53:51 +09:00
Dean Herbert
0833a6fb9a Avoid multiple iteration of LINQ query using a local 2022-08-16 15:39:23 +09:00
Dean Herbert
7cc9fdbaa0 Simplify context menu check by using existing mergeable object list 2022-08-16 15:39:23 +09:00
Dean Herbert
ecb9351bab Remove unnecessary null pre-checks 2022-08-16 15:36:43 +09:00
Dean Herbert
e636fcd9b8 Use DI'd components from parent class rather than fetching locally 2022-08-16 15:35:32 +09:00
Dean Herbert
ea50936d71 Fix slider ticks playing back at infinite rate while making changes to a slider in the editor 2022-08-16 15:27:58 +09:00