Dean Herbert
7daab2d45b
Merge branch 'master' into skin-editor-transform-fix
2022-06-20 14:10:01 +09:00
Dean Herbert
e4d0c7a0fb
Move beatmap import step to only be required when entering gameplay
2022-06-20 14:08:05 +09:00
Dean Herbert
329f1a0822
Add test coverage of original fail case and improve test reliability and code quality
2022-06-20 14:08:05 +09:00
Dan Balasescu
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
Dean Herbert
243806e810
Move common step of toggling skin editor to own method
2022-06-20 13:32:44 +09:00
Dean Herbert
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
Salman Ahmed
5e594e4de0
Work around macOS agent regression affecting iOS CI builds
2022-06-20 06:54:15 +03:00
Gabe Livengood
2b0e82be40
add test coverage
2022-06-19 14:35:05 -04:00
Gabe Livengood
a5bc769243
clear skineditor selected components on hide
2022-06-19 14:34:52 -04:00
Gabe Livengood
36df1da57f
Revert "stop component transform when skineditor is hidden"
...
This reverts commit 48ffd6aeb5
2022-06-19 14:26:02 -04:00
Bartłomiej Dach
3ab8158b92
Do not try to set ruleset from beatmap if it's a dummy
2022-06-19 20:08:39 +02:00
Bartłomiej Dach
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
Bartłomiej Dach
def87ed782
Add failing test for editor gameplay test using wrong ruleset
2022-06-19 19:28:35 +02:00
Bartłomiej Dach
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
Bartłomiej Dach
9023fdc947
Merge branch 'master' into reidrect-graceful-exit
2022-06-19 13:43:15 +02:00
Bartłomiej Dach
495d747da5
Fix mismatching braces in comment
2022-06-19 13:42:45 +02:00
Dan Balasescu
98d69c846c
Reset spectator speed at last frame
2022-06-19 17:12:20 +09:00
Dean Herbert
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
Dean Herbert
6515b249ec
Change data migration to do an immediate exit, rather than attempted exit
2022-06-19 12:39:58 +09:00
Joseph Madamba
de61b9e410
Revert "Add automated commit to git-blame-ignore-revs"
...
This reverts commit 11bd87045e
2022-06-18 20:36:21 -07:00
Dean Herbert
50e40756c4
Rename GracefullyExit to AttemptExit
2022-06-19 12:34:44 +09:00
Dan Balasescu
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
Salman Ahmed
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
Salman Ahmed
a2e17941e5
Merge branch 'master' into timing-offset-adjust-seek-only-at-start
2022-06-19 01:27:44 +03:00
Bartłomiej Dach
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
Bartłomiej Dach
2a95715652
Merge branch 'master' into fix-input-regression
2022-06-18 19:44:53 +02:00
Salman Ahmed
f7fc456bb1
Merge branch 'master' into reidrect-graceful-exit
2022-06-18 19:37:53 +03:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
b2663d9399
Update xmldoc to suggest that GracefullyExit may be overridden
2022-06-19 01:14:48 +09:00
Salman Ahmed
47ce087694
Actually click the gameplay scene button than TriggerClick
2022-06-18 18:32:02 +03:00
Dean Herbert
3fa8c19acd
Merge branch 'master' into latency-certifier/hidden-cursor
2022-06-19 00:31:11 +09:00
Salman Ahmed
a5e5172b91
Fix BlueprintContainer eating input from skin editor buttons
2022-06-18 18:28:36 +03:00
Dean Herbert
56abe54fe6
Redirect graceful exiting to standard exit flow
...
Rather than doing a completely forced exit as we were, this will now
follow a more standard flow with the ability for the user to abort along
the way. This is more in line with how I wanted this to work.
Note that this means a confirmation is now shown. It has been discussed
in the past that this confirmation should only show when there's an
ongoing action implies the user may want to cancel the exit. For now I
think this is fine.
Addresses
https://github.com/ppy/osu/discussions/18399#discussioncomment-2811311
2022-06-18 23:43:46 +09:00
Bartłomiej Dach
cbc218200a
Merge pull request #18708 from smoogipoo/multi-song-select-operation
...
Block multiplayer operations until beatmap selection completes
2022-06-18 12:42:04 +02:00
Bartłomiej Dach
5917c70127
Merge branch 'master' into multi-song-select-operation
2022-06-18 11:58:13 +02:00
Bartłomiej Dach
9334e7b949
Merge pull request #18703 from frenzibyte/editor-metadata-name-unification
...
Use unified name for background/track files on editor import
2022-06-18 11:12:03 +02:00
Bartłomiej Dach
f6a3047596
Merge branch 'master' into editor-metadata-name-unification
2022-06-18 10:22:52 +02:00
Dan Balasescu
24c78c24f0
Merge pull request #18754 from peppy/placement-object-use-last-sample-point
...
Fix new hitobject placements not taking on the existing sample settings
2022-06-18 14:46:00 +09:00
Dan Balasescu
77e7e4ecb2
Fix selection being blocked after early return
2022-06-18 14:28:30 +09:00
Dean Herbert
bd5037fcad
Fix new hitobject placements not taking on the existing sample settings
...
Similar to velocity / difficulty points, a user expectation is that
volume and sample settings will be transferred to newly placed objects
from the most recent one.
Closes https://github.com/ppy/osu/issues/18742 .
2022-06-18 13:49:59 +09:00
Dean Herbert
635d1d3095
Merge branch 'master' into prevent-mistimed-metronome-beats
2022-06-18 12:08:15 +09:00
Dean Herbert
6c0106f1e7
Merge pull request #18752 from frenzibyte/cancel-metronome-on-pause
...
Cancel previous metronome sound playback on pause
2022-06-18 11:19:18 +09:00
Dean Herbert
f3c9f9a216
Merge pull request #18751 from frenzibyte/tournament-beatmap
...
Improve tournament beatmap JSON storage using lightweight model
2022-06-18 11:00:26 +09:00
Dean Herbert
8ad96fd94b
Update resources
2022-06-18 10:55:24 +09:00
Dean Herbert
fbca7c761d
Merge pull request #18750 from frenzibyte/tournament-player
...
Improve tournament player JSON storage using lightweight model
2022-06-18 10:52:54 +09:00
Salman Ahmed
204348f327
Fix metronome playing mistimed beat sounds on editor clock resume
2022-06-18 04:49:44 +03:00
Salman Ahmed
8a1d11fefb
Cancel previous metronome sound playback on pause
2022-06-18 04:07:21 +03:00
Dan Balasescu
e04df371d1
Merge branch 'master' into multi-song-select-operation
2022-06-18 08:51:24 +09:00
Dan Balasescu
14cdb01fd8
Revert unintended change
2022-06-18 08:49:48 +09:00
