Commit Graph

54857 Commits

Author SHA1 Message Date
d38defada4 Silence exception and provide more log output when import fails due to empty .osu files 2022-06-20 16:07:10 +09:00
e82d948acc Add test coverage of import throwing when no valid .osu files are found 2022-06-20 16:06:22 +09:00
4aa32038c3 Add note about stream provided to ImportTask being disposed implicitly 2022-06-20 15:38:44 +09:00
882e1c69e5 Move nested task back outside try-catch to avoid double-error 2022-06-20 15:36:44 +09:00
678b18dde6 Ensure any non-MemoryStream streams are closed as part of ImportTask 2022-06-20 15:29:56 +09:00
a922ea9b01 Fix selection by directly comparing control points
Previously, all control points would get replaced, which led to
performance issues that was worked around in this PR. By comparing
control points, we're able to get good performance without requiring the
workaround.
2022-06-20 15:29:29 +09:00
03ab6fc141 Implement IEquatable on ControlPoint 2022-06-20 15:27:43 +09:00
dd93c7359e Update xmldoc for importFromArchive method 2022-06-20 15:25:43 +09:00
92f1a2958c Rename Import(TModel) to ImportModel to differentiate from other import methods 2022-06-20 15:18:07 +09:00
a6c8a832aa Remove Import(ArchiveReader) and redirect existing usages to Import(ImportTask) 2022-06-20 15:14:57 +09:00
2edd56ad17 Merge pull request #18747 from ggliv/skin-editor-transform-fix
Clear selected components on SkinEditor hide
2022-06-20 14:47:28 +09:00
7daab2d45b Merge branch 'master' into skin-editor-transform-fix 2022-06-20 14:10:01 +09:00
e4d0c7a0fb Move beatmap import step to only be required when entering gameplay 2022-06-20 14:08:05 +09:00
329f1a0822 Add test coverage of original fail case and improve test reliability and code quality 2022-06-20 14:08:05 +09:00
468e5fcbed Merge branch 'master' into editor-controlpoint-undo-redo 2022-06-20 13:47:01 +09:00
a3fb6fb473 Merge pull request #18774 from frenzibyte/fix-ios-ci
Work around macOS agent regression affecting iOS CI builds
2022-06-20 13:40:04 +09:00
243806e810 Move common step of toggling skin editor to own method 2022-06-20 13:32:44 +09:00
9568525486 Merge pull request #18771 from bdach/editor-playtest-correct-ruleset
Always use beatmap ruleset in editor gameplay test mode
2022-06-20 13:07:39 +09:00
5e594e4de0 Work around macOS agent regression affecting iOS CI builds 2022-06-20 06:54:15 +03:00
26b0815fc8 fixed casting the wrong skill 2022-06-20 04:19:07 +02:00
ecbbd29c9b Merge branch 'master' into speed-acc-scaling
# Conflicts:
#	osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
#	osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
#	osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
#	osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
2022-06-20 04:15:35 +02:00
2b0e82be40 add test coverage 2022-06-19 14:35:05 -04:00
a5bc769243 clear skineditor selected components on hide 2022-06-19 14:34:52 -04:00
36df1da57f Revert "stop component transform when skineditor is hidden"
This reverts commit 48ffd6aeb5.
2022-06-19 14:26:02 -04:00
3ab8158b92 Do not try to set ruleset from beatmap if it's a dummy 2022-06-19 20:08:39 +02:00
93b3ede2a0 Always use beatmap ruleset in editor gameplay test mode
Fixes cases where opening a convertible beatmap (so any osu! beatmap)
with the game-global ruleset being set to anything but osu! would result
in opening the editor gameplay test mode with the game-global ruleset
rather than the beatmap's.
2022-06-19 19:30:40 +02:00
def87ed782 Add failing test for editor gameplay test using wrong ruleset 2022-06-19 19:28:35 +02:00
9a6f4ef76d Save score button on failed screen 2022-06-19 23:59:37 +09:00
9518e1db05 Merge pull request #18760 from peppy/reidrect-graceful-exit
Redirect graceful exiting to standard exit flow
2022-06-19 14:38:29 +02:00
9023fdc947 Merge branch 'master' into reidrect-graceful-exit 2022-06-19 13:43:15 +02:00
495d747da5 Fix mismatching braces in comment 2022-06-19 13:42:45 +02:00
vun
3529514587 Disablle nullable in TaikoDifficultyHitObjectColour 2022-06-19 17:26:11 +08:00
vun
57964311be Revert performance calculator to upstream 2022-06-19 17:20:53 +08:00
vun
95c43d9384 Merge remote-tracking branch 'ppy/master' into colour-rework 2022-06-19 17:18:05 +08:00
vun
da1d99d5b6 Parameter tweaks, change repetition interval definition 2022-06-19 17:14:31 +08:00
98d69c846c Reset spectator speed at last frame 2022-06-19 17:12:20 +09:00
2a9fbea367 Merge pull request #18766 from Joehuu/revert-ignore-nrt-commit
Revert "Add automated commit to git-blame-ignore-revs"
2022-06-19 13:09:00 +09:00
6515b249ec Change data migration to do an immediate exit, rather than attempted exit 2022-06-19 12:39:58 +09:00
de61b9e410 Revert "Add automated commit to git-blame-ignore-revs"
This reverts commit 11bd87045e.
2022-06-18 20:36:21 -07:00
50e40756c4 Rename GracefullyExit to AttemptExit 2022-06-19 12:34:44 +09:00
1bd6198da2 Merge pull request #18692 from apollo-dw/dbltap
Rework doubletap detection in osu!'s Speed evaluator
2022-06-19 11:03:16 +09:00
d0c9788a4a Merge pull request #18762 from peppy/timing-offset-adjust-seek-only-at-start
Fix adjusting offset via button seeking to timing point's offset unexpectedly
2022-06-19 02:11:49 +03:00
a2e17941e5 Merge branch 'master' into timing-offset-adjust-seek-only-at-start 2022-06-19 01:27:44 +03:00
72c5ea9365 Merge pull request #18761 from frenzibyte/fix-input-regression
Fix `BlueprintContainer` eating input from skin editor buttons
2022-06-18 20:28:06 +02:00
2a95715652 Merge branch 'master' into fix-input-regression 2022-06-18 19:44:53 +02:00
f7fc456bb1 Merge branch 'master' into reidrect-graceful-exit 2022-06-18 19:37:53 +03:00
3902dc64f0 Fix adjusting offset via button seeking to timing point's offset unexpectedly
This was added with the intention of tracking the offset when already at
the start (the most common case when you're using the tap timing
wizard), but was also seeking when the user may be much further beyond
or before it.

Addresses https://github.com/ppy/osu/discussions/18741#discussioncomment-2975051.
2022-06-19 01:35:45 +09:00
3105e04839 Merge pull request #18736 from frenzibyte/latency-certifier/hidden-cursor
Refactor `LatencyCursorContainer` to display menu cursor when inactive
2022-06-19 01:19:37 +09:00
b2663d9399 Update xmldoc to suggest that GracefullyExit may be overridden 2022-06-19 01:14:48 +09:00
47ce087694 Actually click the gameplay scene button than TriggerClick 2022-06-18 18:32:02 +03:00