Commit Graph

8075 Commits

Author SHA1 Message Date
dd48b68f8a Ensure selected blueprints are given selection priority 2021-03-19 22:44:33 +01:00
e72205eea2 Merge pull request #12080 from peppy/add-25-playback-editor
Change editor speed adjust to adjust frequency (and restore 25% option)
2021-03-19 21:04:12 +09:00
8955071703 Change editor speed adjust to adjust frequency 2021-03-19 20:01:45 +09:00
9be7981e0d Adjust timeline ticks to be more visible 2021-03-19 19:45:00 +09:00
32c571fc94 Adjust keyboard step to be something sensible 2021-03-19 17:13:30 +09:00
711d895a04 Merge pull request #8238 from voidedWarranties/editor-song-end 2021-03-19 16:32:23 +09:00
b9761c8196 Further simplify logic 2021-03-18 16:20:31 -07:00
df6570ebf5 Improve logic and add previously failing test
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-17 15:48:55 -07:00
2e63c2ce20 Fix selection box operation hotkeys not registering in change handler
Could lead to crashes after reversing a note cluster and playing it
back.

The root cause of the crash was that the hotkey operations were not ran
inside of an editor change handler operation. This, in turn, caused the
autoplay replay to not be regenerated after flipping an object cluster,
therefore finally manifesting as a hard crash due to negative time
offsets appearing in judgement results, which interfered with the
default implementation of note lock.

Note that this incidentally also fixes the fact that selection box
hotkey operations (reverse and flip) did not handle undo/redo.
2021-03-17 22:17:42 +01:00
a691291ae8 Merge branch 'master' into editor-song-end 2021-03-17 18:18:19 +01:00
5a7e416495 Merge pull request #12027 from peppy/new-beatmap-empty-fields
Don't fill beatmap metadata with template values on creating a new beatmap
2021-03-17 19:36:21 +09:00
d0e61e5b4d Put back the label 2021-03-17 17:14:04 +09:00
3b6a1180b6 Remove non-accessed field 2021-03-17 17:02:11 +09:00
5adc675862 Focus artist textbox on entering song setup if fields are empty 2021-03-17 16:57:14 +09:00
eda891223c Start the editor with empty artist/creator/difficulty name fields 2021-03-17 16:47:12 +09:00
c7740d1181 Fix opening the editor occasionally causing a hard crash due to incorrect threading logic
Setting one of the global screen `Bindable`s (in this case, `Beatmap`)
is not valid from anywhere but the update thread. This changes the order
in which things happen during the editor startup process to ensure
correctness.

Closes #11968.
2021-03-17 15:52:25 +09:00
9b5d11f2a5 Merge pull request #11958 from bdach/ruleset-filter-v3
Allow rulesets to specify custom song select filtering criteria
2021-03-08 23:23:24 +09:00
ff2327ffac Merge branch 'master' into configure-await-false 2021-03-08 22:24:29 +09:00
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +09:00
765cc5cf37 Remove iOS multiplayer blocking code 2021-03-08 14:35:22 +09:00
f46880f68a Merge branch 'master' into intro-triangles-background-access 2021-03-08 13:31:09 +09:00
74fc5d5b8c Fix potential cross-thread drawable mutation in IntroTriangles 2021-03-08 13:30:07 +09:00
503f29609a Also set additive mode to match stable 2021-03-07 23:40:09 +09:00
3e4dfdb675 Fix pop out count being above displayed count on legacy combo counter 2021-03-06 20:37:27 -08:00
12b7d9e06d Simplify custom filter criteria retrieval 2021-03-06 12:16:01 +01:00
f00089846b Merge branch 'master' into ruleset-filter-v3 2021-03-06 12:14:53 +01:00
f733d1ec1f Expose and document query parser and helpers 2021-03-03 22:03:01 +01:00
f9148eec20 Refactor filter query parsing helper methods
In preparation for exposition as public.
2021-03-03 21:34:14 +01:00
23a46819dc Merge branch 'master' into multiplayer-confirm-on-exit 2021-03-03 20:35:31 +09:00
0f5bce70ad Split confirmation dialog classes apart 2021-03-03 20:34:37 +09:00
012b48dbe5 Remove explicit public definition
Interface members are public by default.
2021-03-03 19:03:45 +09:00
0ede28da2f Fix test failures due to missing dependency 2021-03-03 15:24:55 +09:00
cb4c3503a0 Confirm exiting a multiplayer match 2021-03-03 14:54:18 +09:00
d332fd2414 Handle case where local user tries to change beatmap while not the host 2021-03-03 14:53:47 +09:00
7dce9b04fa Add a more basic ConfirmDialog implementation 2021-03-03 14:50:45 +09:00
fcea900a53 Move main menu (song select) presentation logic to a local implementation
Reduces cross-dependencies between OsuGame and MainMenu.
2021-03-03 14:13:51 +09:00
36e1fb6da8 Add flow to allow MatchSubScreen to handle beatmap presentation locally 2021-03-03 14:13:51 +09:00
6e75ebbb06 Add interface to handle local beatmap presentation logic 2021-03-03 14:13:48 +09:00
42c3309d49 Use ruleset criteria in parsing and filtering 2021-03-02 20:11:21 +01:00
c375be6b07 Instantiate ruleset criteria 2021-03-02 20:10:03 +01:00
e46543a4a9 Constrain operator parsing better 2021-03-02 19:56:36 +01:00
26736d990f Enable filter parsing extensibility 2021-03-02 19:42:47 +01:00
4fd8501c86 Remove unnecessary using (underlying enumerator change) 2021-02-26 20:03:03 +09:00
cd1c1bf534 Centralise cases of performing actions on the current selection
By moving this to a central location, we can avoid invoking the
EditorChangeHandler when there is no selection made. This helps
alleviate the issue pointed out in
https://github.com/ppy/osu/issues/11901, but not fix it completely.
2021-02-26 14:15:13 +09:00
d0decc73be Merge branch 'master' into beatmap-difficulty-cache-nullable 2021-02-25 19:40:38 +01:00
a792c3f13c Merge pull request #11900 from peppy/update-bpm-with-mods
Update the displayed BPM at song select with rate adjust mods
2021-02-26 00:25:55 +09:00
01a4815412 Make labels disappear on null beatmap/no hitobjects 2021-02-25 23:36:02 +09:00
46ea0f44eb Merge branch 'master' into beatmap-difficulty-cache-nullable 2021-02-25 22:52:15 +09:00
c1f27ba938 Merge branch 'master' into fix-song-select-star-rating-display-zero-flashing 2021-02-25 22:13:48 +09:00
c3eb44137b Move ValueChanged bind back to load() 2021-02-25 22:09:41 +09:00