Bartłomiej Dach
5abad07412
Pause playback when entering gameplay test from editor
...
Closes https://github.com/ppy/osu/issues/31290 .
Tend to agree that this is a good idea for gameplay test at least. Not
sure about other similar interactions like exiting - I don't think it
matters what's done in those cases, because for exiting timing is in no
way key, so I just applied this locally to gameplay test.
2024-12-27 09:08:16 +01:00
Bartłomiej Dach
9652c5a7ca
Merge pull request #31110 from peppy/timing-current-point-indicator
...
Change the way "current" points are hinted on timing screen
2024-12-16 13:27:06 +09:00
Bartłomiej Dach
1058abb4ab
Fix code quality
2024-12-16 12:22:06 +09:00
Dean Herbert
da840e3fac
Change the way "current" points are hinted on timing screen
...
I actually thought things were bugged with the previous display method,
since the hinting was very similar to the hover colour/state.
I've adjusted this to hopefully give users a better idea of what this is
intending to show them.
2024-12-13 19:45:18 +09:00
Dean Herbert
64555debc2
Fix adjusting control point offset after undo/redo causing catastrophic failure
...
Closes https://github.com/ppy/osu/issues/31098 .
Low effort fix because it was already half broken. The test was testing
in isolation but in actual editor usage it wasn't working as expected.
2024-12-13 19:33:51 +09:00
Dean Herbert
2a4f596f90
Merge branch 'master' into ios-beatmap-export
2024-12-10 23:59:15 -08:00
Bartłomiej Dach
89e3c551ff
Merge pull request #30860 from frenzibyte/editor-multiple-background-audio-files
...
Allow choosing different background/audio files for individual difficulties
2024-12-11 14:12:58 +09:00
Dean Herbert
bbaa542d4a
Add note about expensive operation
2024-12-10 16:45:26 +09:00
Dean Herbert
3cac583754
Rewrite resource changing code to be more legible (to my eye)
2024-12-10 16:45:26 +09:00
Dean Herbert
7ec2d91e14
Merge branch 'master' into editor-multiple-background-audio-files
2024-12-10 14:19:55 +09:00
Salman Alshamrani
e9868c6318
Enable exporting beatmaps in iOS
2024-12-09 07:47:28 -05:00
Bartłomiej Dach
459533aba6
Merge branch 'master' into bookmarks
2024-12-07 22:22:04 +09:00
Dean Herbert
8d0e1f9d18
Merge branch 'master' into improve-menu-sample-playback
2024-12-05 21:07:03 +09:00
Salman Alshamrani
8e0f6fc12d
Re-encode difficulties on resource change
2024-12-04 04:36:00 -05:00
Salman Alshamrani
60d91bada8
Merge branch 'master' into editor-multiple-background-audio-files
2024-12-04 04:31:15 -05:00
Bartłomiej Dach
d60b7f4798
Implement basic bookmark support in editor
2024-12-03 15:14:22 +01:00
Bartłomiej Dach
808934581f
Move bookmarks out of BeatmapInfo
...
Not sure why I didn't do that in https://github.com/ppy/osu/pull/28473 ...
2024-12-03 14:17:14 +01:00
Bartłomiej Dach
b505ecc7ba
Do not deselect objects when control-clicking without hitting anything
...
As per feedback in
https://discord.com/channels/90072389919997952/1259818301517725707/1310270647187935284 .
2024-12-02 13:51:43 +01:00
Bartłomiej Dach
6c0ccc5ebe
Merge pull request #30863 from frenzibyte/improve-back-button-display
...
Delay back button appearance when performing a quick restart
2024-12-02 11:49:45 +01:00
Dean Herbert
5b2558cec2
Merge pull request #28473 from bdach/beatmap-info-purge
...
Move unnecessary properties from `BeatmapInfo` / realm to `IBeatmap`
2024-12-02 16:19:12 +09:00
Bartłomiej Dach
5f092811cb
Use helper in one more place
2024-11-29 09:22:29 +01:00
Bartłomiej Dach
5a9127dfc6
Accidentally a word
2024-11-29 08:46:08 +01:00
Bartłomiej Dach
110e4fbb30
Centralise supported file extensions to one helper class
...
As proposed in
https://github.com/ppy/osu-server-beatmap-submission/pull/5#discussion_r1861680837 .
2024-11-29 08:42:45 +01:00
Salman Alshamrani
489d7a30ec
Perform a single Save call rather than doing it in each difficulty
2024-11-28 18:37:13 -05:00
Salman Alshamrani
311f0947e4
Abstractify resource change logic and share between background and audio
2024-11-28 17:57:47 -05:00
Salman Alshamrani
932afcde01
Make editor make sense
2024-11-28 17:43:32 -05:00
Jamie Taylor
58cf1c11e4
Improve menu/context-menu sample playback
2024-11-29 06:54:48 +09:00
Salman Alshamrani
b1d0939142
Add localisation support
2024-11-28 02:37:31 -05:00
Salman Alshamrani
4a1401a33d
Rewrite bindable flow to make more sense
2024-11-28 02:37:27 -05:00
Dean Herbert
32b34c1967
Rename container to make more sense
2024-11-28 15:20:51 +09:00
Dean Herbert
4d9d5adbf4
Rename parameter to be more clear
2024-11-28 15:13:59 +09:00
Salman Alshamrani
efb68e4232
Refactor ResourcesSection to support new form of selection
2024-11-27 05:53:22 -05:00
Salman Alshamrani
b70fb4b0fe
Add FormBeatmapFileSelector for intermediate user-choice step
2024-11-27 05:52:43 -05:00
Salman Alshamrani
3e1b4f4ac5
Rename AllowBackButton to AllowUserExit and rewrite visibility flow structure
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2024-11-26 16:52:39 -05:00
Dean Herbert
3ecb3b674d
Don't reset state when changing from one selection to another in the editor
...
This was causing state pollution in the new selection. I can't see why
this needs to happen when a selection changes to another.
This fixes https://github.com/ppy/osu/issues/30839 and also the same
issue happening for the new combo toggle.
Tests all seem to pass, and I can't immediately find anything broken,
but YMMV.
2024-11-26 17:33:41 +09:00
Salman Alshamrani
1468385559
Reset new file states after syncing
2024-11-24 22:38:48 -05:00
Salman Alshamrani
3480da22d2
Remove no-op SaveState call
2024-11-24 01:13:39 -05:00
Salman Alshamrani
95a6226413
Only enable button if there are different filenames
2024-11-24 01:11:36 -05:00
Salman Alshamrani
a872f74974
Make sync button only affect changed resource type
2024-11-24 01:02:34 -05:00
Salman Alshamrani
c8b13b726d
Add localisation support
2024-11-24 00:45:17 -05:00
Salman Alshamrani
e348b3a7aa
Only enable button if there are multiple difficulties
2024-11-24 00:34:03 -05:00
Salman Alshamrani
8e20dc7e9d
Add option to update all difficulties with new background/audio file
2024-11-24 00:32:50 -05:00
Salman Alshamrani
871c365fd8
Preserve existing beatmap background/audio files if used elsewhere
2024-11-24 00:32:27 -05:00
Dean Herbert
086a34f5c0
Merge branch 'master' into beatmap-info-purge
2024-11-22 18:47:32 +09:00
Bartłomiej Dach
259e9ecf65
Deactivate new combo toggle on deselecting objects
...
Closes https://github.com/ppy/osu/issues/30713 .
Was a point of discussion doing review:
https://github.com/ppy/osu/pull/30214#discussion_r1798833139
Given it got pointed out immediately for something so minor, I'm
inclined to believe it's a rather undesirable change.
2024-11-18 15:13:32 +01:00
Bartłomiej Dach
88aea70429
Do not permit new combo toggle to remain in indeterminate state on deselect
2024-11-14 10:07:09 +01:00
Bartłomiej Dach
1b279e45cc
Merge branch 'master' into feat/optimize-polygon-tool
2024-11-14 09:54:04 +01:00
Dean Herbert
54ca705680
Merge branch 'master' into hs-toggle2
2024-11-13 19:15:00 +09:00
Dean Herbert
78084e33af
Merge pull request #30411 from frenzibyte/editor-slider-touch-support-2
...
Fix placing objects via touch in editor not working sometimes
2024-11-13 15:09:57 +09:00
Dean Herbert
19f887e283
Merge branch 'master' into feat/optimize-polygon-tool
2024-11-13 13:59:54 +09:00
Bartłomiej Dach
c37e4877e2
Move setting back to timing panel
2024-11-11 10:08:26 +01:00
Bartłomiej Dach
0cddb93dda
Move setting to user config
2024-11-11 09:57:17 +01:00
Bartłomiej Dach
a6cdf6df07
Merge branch 'master' into move-already-placed-objects-when-adjusting-offset-bpm
2024-11-11 09:50:00 +01:00
Dean Herbert
9d65d394d3
Add ability to hide breaks from timeline
...
This was another IRL request from a mapper / team member. The rationale
here is that it can be very annoying to map with break time enabled if
you have a large gap in the beatmap you are trying to fill with
hitobjects, as you are placing objects on top of a very gray area.
2024-11-05 12:56:19 +09:00
Dean Herbert
b03963ac84
Remember origin for editor scale popover
2024-11-03 15:20:51 +09:00
Bartłomiej Dach
f2afec23f9
Merge branch 'master' into hs-toggle2
2024-11-01 18:44:33 +01:00
Bartłomiej Dach
8f48682d0a
Remove hide sample toggle
...
In line with feedback from
https://github.com/ppy/osu/pull/29896#issuecomment-2378676851 .
2024-11-01 18:44:24 +01:00
Salman Alshamrani
0e65655fef
Remove redundant condition in else branch
...
Yep.
2024-10-25 23:15:17 -04:00
Bartłomiej Dach
b72a50bbaa
Merge pull request #30387 from peppy/editor-sidebars-always-expanded
...
Keep editor sidebars expanded by default
2024-10-25 19:46:35 +02:00
OliBomby
eb61da4232
only consider hit objects which are visible in timeline for contracted state
2024-10-24 21:22:09 +02:00
OliBomby
88e88bdc4f
Fix addition banks disabled on reset
2024-10-24 13:17:49 +02:00
OliBomby
5b92a9ff59
Fix enabled state not updating drawable
2024-10-24 13:15:09 +02:00
Dean Herbert
940220b649
Fix big oops
2024-10-24 19:57:39 +09:00
Dean Herbert
77bd0e8d70
Add visual disabled state to ternary buttons
2024-10-24 18:36:34 +09:00
Salman Alshamrani
6e9ff49e59
Merge branch 'master' into editor-slider-touch-support-2
2024-10-23 17:02:38 -04:00
Salman Alshamrani
3a4d5af83e
Fix placement blueprints sometimes not behaving correctly with touch input
...
More specifically, this fixes placement blueprints not beginning placement when using touch input while the cursor was previously outside compose area, due to the placement blueprint not existing (removed from the scene by `ComposeBlueprintContainer`).
2024-10-23 16:51:21 -04:00
OliBomby
ddbeb56f0f
Show tooltip on auto normal bank when not usable
2024-10-23 21:25:37 +02:00
Dean Herbert
cb880f7e9b
Merge branch 'master' into move-already-placed-objects-when-adjusting-offset-bpm
2024-10-23 18:20:43 +09:00
Dean Herbert
5939c78760
Merge branch 'master' into auto-addition2
2024-10-23 15:53:07 +09:00
Dean Herbert
2103b3e186
Merge pull request #28863 from OliBomby/additions
...
Add toggles and hotkeys for configuring sample addition bank
2024-10-23 15:52:55 +09:00
Dean Herbert
53a340938a
Merge pull request #30377 from bdach/very-bad-completely-no-good-comparer
...
Fix timeline blueprints sometimes causing crashes due to current placement blueprint becoming unsorted
2024-10-22 20:20:03 +09:00
Bartłomiej Dach
24dfc1b66e
Merge pull request #30328 from TaterToes/seekingControlPointFix
...
Add breathing room to seek back between control points in editor
2024-10-22 13:14:24 +02:00
Dean Herbert
e37d415c6f
Keep editor sidebars expanded by default
...
They will not only contract if the user chooses to have them contract
(new setting in the `View` menu) or if the game isn't wide enough to
allow full interaction with the playfield while they are expanded.
Addressess https://github.com/ppy/osu/discussions/28970 .
2024-10-22 20:08:50 +09:00
Dean Herbert
16bc188ba7
Refactor code to read better (and adjust lenience to match stable)
2024-10-22 18:08:25 +09:00
Bartłomiej Dach
dbc2e78dd9
Fix timeline blueprints sometimes causing crashes due to current placement blueprint becoming unsorted
...
Closes https://github.com/ppy/osu/issues/30324 .
2024-10-21 14:48:57 +02:00
OliBomby
22aef90cb7
dont contract samples for stacked objects
2024-10-20 00:07:40 +02:00
OliBomby
f137fed04e
Update sample point contracted state each frame
2024-10-19 23:57:41 +02:00
OliBomby
c03017438e
Use FinishTransforms to init visual state
2024-10-19 23:57:05 +02:00
TaterToes
1cc6309656
attempt to fix formatting
2024-10-18 07:21:05 -04:00
TaterToes
0a8ba4bfb5
cleanup
2024-10-17 18:41:00 -04:00
TaterToes
c8b0220934
fix comment
2024-10-17 18:12:05 -04:00
TaterToes
e10293531b
adjust margin time and apply rate adjust
2024-10-17 18:10:48 -04:00
TaterToes
45dd9b1167
Forgot subtraction
2024-10-17 17:01:42 -04:00
TaterToes
3fe0791298
fix seeking back on control points
2024-10-17 16:26:13 -04:00
Salman Alshamrani
e151c0fab1
Fix coding mistake
2024-10-14 15:11:44 -04:00
Salman Alshamrani
40b98d4863
Move conditional
2024-10-14 09:55:24 -04:00
Bartłomiej Dach
cd59b93cc9
Merge branch 'master' into feat/optimize-polygon-tool
2024-10-14 08:28:30 +02:00
Salman Alshamrani
f8c8184c5c
Fix placement blueprints not receiving latest mouse position with touch input
2024-10-13 11:01:18 -04:00
Marvin Schürz
f76a2d02f6
Make sure to properly update hitobjects
2024-10-11 23:22:15 +02:00
Marvin Schürz
af55585dc8
Make TriggerAction public
2024-10-10 20:50:47 +02:00
Marvin Schürz
fc7ad96fcd
Move circle flash to TriggerAction
2024-10-10 20:20:02 +02:00
Marvin Schürz
9cc6ee2ebc
Fix SelectionBox buttons freezing when button is triggered via key event
2024-10-10 20:14:11 +02:00
OliBomby
d7526be243
Merge remote-tracking branch 'upstream/master' into grids-4
2024-10-07 11:56:35 +02:00
Dean Herbert
11fc811e2f
Fix delete dialogs having generic "Caution" header text
...
Regressed in https://github.com/ppy/osu/pull/28363 .
2024-10-07 16:46:53 +09:00
Dean Herbert
1ab02b93b3
Merge branch 'master' into grids-4
2024-10-07 15:42:23 +09:00
Dean Herbert
5c826be652
Merge pull request #29860 from bdach/fix-nudging
...
Only allow seek to next/previous object via keybinding if there is no selection
2024-10-07 15:36:19 +09:00
OliBomby
48da758c39
contract sample point pieces based on smallest gap on the timeline
...
It finds the smallest distance between two sample point pieces on the alive timeline blueprints
2024-10-05 20:52:45 +02:00
Bartłomiej Dach
7816c41b94
Only transfer difficulty slider values on commit
...
Closes https://github.com/ppy/osu/issues/30112 .
2024-10-04 14:08:46 +02:00
Dean Herbert
4fc0aae486
Merge pull request #30108 from bdach/default-combo-colours-in-editor
...
Initialise colours section with default combo colours if none present
2024-10-04 18:57:25 +09:00
Bartłomiej Dach
61103cc712
Remove redundant initialiser
2024-10-04 11:18:09 +02:00
Bartłomiej Dach
7cd724f342
Move setup screen background preview to appropriate form control
...
See
https://discord.com/channels/188630481301012481/188630652340404224/1291361342971707463 .
2024-10-04 11:09:14 +02:00
Bartłomiej Dach
6e5a38c6c8
Initialise colours section with default combo colours if none present
...
Closes https://github.com/ppy/osu/issues/30100 .
2024-10-04 10:01:24 +02:00
Bartłomiej Dach
1bab2236fe
Ensure columns collapse into one correctly if no space
2024-10-03 15:01:23 +02:00
Bartłomiej Dach
99eb26b7d5
Redo the layout of sections based on discord feedback
...
See
https://discord.com/channels/188630481301012481/188630652340404224/1291358770064130140
and everything after.
2024-10-03 13:53:21 +02:00
Bartłomiej Dach
b15608343b
Replace setup screen controls with new "form" controls
2024-10-03 11:49:03 +02:00
OliBomby
f8397cccc7
Merge remote-tracking branch 'upstream/master' into grids-4
2024-10-01 15:43:54 +02:00
OliBomby
154a3eebc6
Reset the sample bank states to auto when selection is cleared
...
this matches behaviour in stable
2024-10-01 13:22:20 +02:00
OliBomby
1960a0d44d
Add tooltip to explain why addition banks dont work when no additions exist
2024-10-01 13:07:25 +02:00
Dean Herbert
54e68005ef
Merge pull request #29691 from bdach/hotkeys-in-context-menus
...
Add hotkey hints to editor menus
2024-10-01 19:29:05 +09:00
OliBomby
0a78eb9628
Implement auto additions editor-only
2024-10-01 16:40:48 +09:00
Dean Herbert
1b4215576d
Merge branch 'master' into additions
2024-10-01 16:38:56 +09:00
Dean Herbert
75745bd95f
Merge branch 'master' into move-already-placed-objects-when-adjusting-offset-bpm
2024-10-01 15:53:13 +09:00
Dean Herbert
590f27e0a0
Merge branch 'master' into hotkeys-in-context-menus
2024-10-01 15:50:19 +09:00
Bartłomiej Dach
11fc1f9a1c
Fix distance snap grid using wrong colour when reference object is unsnapped
2024-09-30 13:36:51 +02:00
Bartłomiej Dach
75fc57c34b
Fix distance spacing grid displaying incorrectly for unsnapped objects with duration
2024-09-30 13:36:16 +02:00
Dean Herbert
a258059d43
Merge pull request #29918 from bdach/control-drag
...
Add to existing selection when dragging with control pressed
2024-09-30 14:00:36 +09:00
Dean Herbert
c46d787f1e
Merge pull request #29949 from minetoblend/feature/scale-around-center
...
Support scaling around center when scaling with select box
2024-09-28 21:37:39 +09:00
Bartłomiej Dach
d607331755
Fix control-drag selection expansion deselecting object if control is released over one of the blueprints
2024-09-27 12:15:08 +02:00
Bartłomiej Dach
b45fedc356
Merge branch 'master' into control-drag
2024-09-27 11:39:50 +02:00
Bartłomiej Dach
33593280d8
Merge pull request #29938 from OliBomby/selection-center
...
Use minimum enclosing circle as selection centre for scale and rotate
2024-09-27 10:46:32 +02:00
Dean Herbert
9dcce67b81
Make points slightly smaller when contracted and fix width getting obliterated
2024-09-27 17:24:24 +09:00
Dean Herbert
ce41dc4629
Use bindable flow for zoom handling
2024-09-27 17:13:26 +09:00
Bartłomiej Dach
766d2d2ad2
Merge pull request #29950 from minetoblend/feature/freeze-select-box-buttons
...
Freeze select box buttons position on press
2024-09-27 10:13:06 +02:00
Bartłomiej Dach
fa90b43233
Merge branch 'master' into selection-center
2024-09-27 09:30:36 +02:00
OliBomby
b179e086c6
Merge remote-tracking branch 'upstream/master' into grids-4
2024-09-26 14:59:52 +02:00
Bartłomiej Dach
f16f419928
Merge pull request #29983 from bdach/directory-selector-redesign
...
Redesign directory & file selector
2024-09-26 14:14:22 +02:00
OliBomby
e3b4483872
Refactor PlacementBlueprint to not be hitobject specific
2024-09-24 20:31:00 +02:00
Marvin Schürz
99a80b399c
Animate SelectionBox buttons on unfreeze
2024-09-24 16:42:37 +02:00
Bartłomiej Dach
7f8b64bb6d
Redesign directory & file selector (and update usages accordingly)
2024-09-24 14:54:48 +02:00
Marvin Schürz
b54b4063be
Rename parameter
2024-09-24 12:40:28 +02:00
OliBomby
0f0f490598
Don't snap to global grid while placing grid
2024-09-23 17:24:09 +02:00
OliBomby
1a81e12192
Refactor PlacementBlueprint to not be hitobject specific
2024-09-23 16:33:36 +02:00
OliBomby
a9ebfbe431
Assert default origin not null in rotation handle
2024-09-23 11:37:42 +02:00
OliBomby
92b5650ff8
fix outdated comment
2024-09-23 10:56:03 +02:00
Marvin Schürz
1095f35025
Only store position instead of entire draw quad
2024-09-21 15:25:37 +02:00
Marvin Schürz
0077ba72ec
Freeze select box buttons in place as long as they are hovered
2024-09-21 14:59:47 +02:00
Marvin Schürz
2dbbbe270d
Scale around center when pressing alt while dragging selection box scale handle
2024-09-21 13:37:41 +02:00
OliBomby
ee00624751
use minimum enclosing circle selection centre in rotation
2024-09-20 01:07:47 +02:00
OliBomby
34087a0f1a
Reduce sample point pieces to pink dot if zoomed out
2024-09-19 16:20:26 +02:00
Dean Herbert
188a430418
Merge branch 'master' into grids-3
2024-09-19 18:21:05 +09:00
Bartłomiej Dach
f6195c5515
Add to existing selection when dragging with control pressed
...
Closes https://github.com/ppy/osu/issues/29023 .
2024-09-18 15:18:13 +02:00
OliBomby
e4cfa7c86f
Add view menu toggle for sample points
2024-09-17 11:27:23 +02:00
Dean Herbert
58fe502af4
Merge branch 'master' into beatmap-info-purge
2024-09-15 04:53:35 +09:00
Bartłomiej Dach
7f71ef4547
Only allow seek to next/previous object via keybinding if there is no selection
2024-09-13 15:14:09 +02:00
Bartłomiej Dach
7ec2e0e866
Refactor layout code to be a bit less haphazard
...
Visually the same, functionally much saner.
2024-09-08 16:30:09 +02:00
Bartłomiej Dach
f5c5614eef
Resolve existing colour provider instead of re-caching own one
2024-09-08 16:29:53 +02:00
schiavoanto
2e6f17f253
Fixed wrong OverlayColourScheme
2024-09-08 16:04:10 +02:00
schiavoanto
cf23c6668c
Added background color to hide beatmap background
2024-09-08 15:59:23 +02:00
schiavoanto
2bc6547d49
Code quality fix: added type
2024-09-07 16:23:23 +02:00
schiavoanto
32de8e9b2d
Fixed ControlPointTable items being blocked by buttons
2024-09-07 16:15:00 +02:00
