Nathan Alo
8046b5a818
set text to platform clipboard on copy
2021-03-17 17:35:49 +08:00
Dean Herbert
3b6a1180b6
Remove non-accessed field
2021-03-17 17:02:11 +09:00
Dean Herbert
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
Dan Balasescu
c70dd2edfc
Merge pull request #11569 from peppy/fix-editor-new-beatmap-crash
...
Fix a potential crash when exiting the editor before a new beatmap is added to the database
2021-02-01 21:01:51 +09:00
Dean Herbert
4ac362ee1a
Move cloning local to editor
2021-01-25 18:29:00 +09:00
Dean Herbert
b44bd8c4ee
Remove unused using statement
2021-01-22 18:03:33 +09:00
Dean Herbert
a9c8f9bd4a
Fix a potential crash when exiting the editor before a new beatmap is added to the database
2021-01-22 17:47:38 +09:00
Dean Herbert
2cfd1e8b47
Merge branch 'master' into fix-control-point-pollution
2021-01-08 00:02:45 +09:00
Dean Herbert
b3f08b29ca
Ensure that all changes to screen backgrounds are on the correct thread
2021-01-05 15:22:50 +09:00
Dean Herbert
b4a779108e
Ensure working beatmap is reloaded on exiting the editor
2021-01-04 16:37:49 +09:00
Dean Herbert
83f1350d7d
Fix editor background not being correctly cleaned up on forced exit
...
Closes #11214 . Should be pretty obvious why.
2020-12-21 17:49:11 +09:00
Dean Herbert
e84dab8589
Move new beatmap construction above beat divisor binding
2020-12-02 14:36:52 +09:00
Dean Herbert
2b268ee012
Fix editor beat snapping not working correctly when starting with a new beatmap
2020-12-01 16:16:26 +09:00
Dean Herbert
d4c6d6275e
Fix volume not being adjustable in the editor using alt-scroll
...
We do this in other places so I think it's fine to handle like this for
now (until we come up with a better global solution).
Closes #10958 .
2020-11-25 16:46:22 +09:00
Bartłomiej Dach
e078b78dcc
Ensure callbacks don't fire when restoring default beatmap
2020-11-07 20:59:57 +01:00
Dean Herbert
7e4314684b
Add editor waveform opacity selection to menu
2020-11-03 16:01:14 +09:00
Dean Herbert
351acce698
Merge branch 'master' into fix-editor-bindable-crash
2020-10-28 13:34:54 +09:00
Dean Herbert
01b576c861
Fix editor crash on exit when forcing exit twice in a row
2020-10-28 13:32:39 +09:00
Dean Herbert
e0ad005cc1
Move editor sample disabling logic to editor class (and support screen switching)
2020-10-27 14:33:44 +09:00
Dean Herbert
aea31d1582
Fix editor not seeking by full beat when track is playing
...
This is expected behaviour as my osu-stable, and I still stand behind
the reasoning behind it.
Closes #10519 .
2020-10-16 13:07:00 +09:00
Dan Balasescu
ecfb7e94c5
Merge branch 'master' into fix-editor-batch-handling
2020-10-09 20:06:06 +09:00
Dean Herbert
68039cff40
Set beatmap to sane default on exiting editor
2020-10-09 13:12:48 +09:00
Dean Herbert
38babf3de5
Update usages of ChangeHandler to EditorBeatmap where relevant
2020-10-08 18:04:07 +09:00
Dean Herbert
09f5e9c9eb
Use batch change application in many places that can benefit from it
2020-10-06 22:10:07 +09:00
Dean Herbert
3ce234d552
Seek at 4x normal speed when holding shift
...
This matches osu-stable 1:1. Not sure if it feels better or not but
let's stick with what people are used to for the time being.
2020-10-06 17:47:25 +09:00
Dean Herbert
9ca0e48acc
Change exit logic to be more test-friendly
2020-10-04 23:57:28 +09:00
Dean Herbert
02e4f3ddaf
Fix the editor saving new beatmaps even when the user chooses not to
2020-10-04 23:47:16 +09:00
Dean Herbert
d6f3beffb6
Use existing bindable flow instead
2020-09-29 12:50:17 +09:00
Dean Herbert
4f0c0ea5f9
Fix hit samples playing while paused / seeking in the editor
2020-09-28 18:17:47 +09:00
Dan Balasescu
e828cf1607
Merge branch 'master' into editor-load-audio
2020-09-25 14:49:54 +09:00
Dean Herbert
44a6637c36
Use SingleOrDefault
2020-09-25 12:20:37 +09:00
Dean Herbert
978f6edf38
Add basic track reloading support while inside the editor
2020-09-24 20:56:35 +09:00
Dean Herbert
158d307126
Avoid destroying editor screens when changing between modes
2020-09-24 17:03:54 +09:00
Dean Herbert
3062fe4411
Add editor key bindings to switch between screens
2020-09-22 15:55:25 +09:00
Dean Herbert
692f2c8489
Simplify debounced update pathway
2020-09-14 14:58:00 +09:00
Dean Herbert
320e314356
Use minimum start time to handle SelectedHitObjects not being sorted
2020-09-13 22:53:30 +09:00
Dean Herbert
c573392bb2
Remove completed todo
2020-09-13 22:31:59 +09:00
Dean Herbert
1a9f0ac16a
Select new objects
2020-09-12 21:23:12 +09:00
Dean Herbert
2d9b0acabe
Fix empty selection via keyboard shortcuts crashing
2020-09-12 21:23:10 +09:00
Dean Herbert
001cd1194c
Consume BindCollectionChanged
2020-09-11 22:53:03 +09:00
Dean Herbert
08be45c9e7
Merge branch 'master' into editor-clipboard
2020-09-11 20:35:05 +09:00
Dean Herbert
2858296c25
Avoid editor confirm-save dialog looping infinitely when using keyboard shortcut to exit
...
Will now exit without saving if the keyboard shortcut is activated twice
in a row, as expected.
Closes #10136 .
2020-09-11 19:58:37 +09:00
Dean Herbert
de3d8e83e1
Add keyboard shortcuts
2020-09-11 19:55:41 +09:00
Dean Herbert
7d7401123c
Add initial implementation of editor clipboard
2020-09-11 19:54:20 +09:00
Dean Herbert
c6e72dabd3
Add test coverage
2020-09-09 20:04:25 +09:00
Dean Herbert
327179a81e
Expose unsaved changes state
2020-09-09 19:42:03 +09:00
Dean Herbert
6f067ff300
Only show confirmation if changes have been made since last save
2020-09-09 19:40:41 +09:00
Dean Herbert
ac0c4fcb8c
Add prompt to save beatmap on exiting editor
2020-09-09 19:31:19 +09:00
Dean Herbert
a501df954b
Avoid multiple editor screens potentially loading on top of each other
2020-09-08 19:52:05 +09:00
smoogipoo
9ab6d584d3
Merge branch 'master' into editor-new-beatmap
2020-09-07 14:30:41 +09:00
Dean Herbert
fba253f131
Take user argument in CreateNew method parameters
2020-09-04 13:17:43 +09:00
Dean Herbert
d849f7f2b5
Use the local user's username when saving a new beatmap
2020-09-03 13:20:23 +09:00
Dean Herbert
e032844570
Start with a fresh beatmap when entering editor from main menu
2020-09-03 13:20:23 +09:00
Craftplacer
9835d98942
Merge remote-tracking branch 'upstream/master' into combo-colors
2020-09-01 17:39:35 +02:00
Dean Herbert
bee01bdd38
Fix first scroll wheel in editor incorrectly advancing twice
2020-08-31 18:01:16 +09:00
Craftplacer
db413686bb
Add BeatmapSkin to EditorBeatmap
2020-08-30 21:12:45 +02:00
Craftplacer
f5c82d41eb
Remove if-cast
2020-08-30 16:06:48 +02:00
Craftplacer
e6646b9877
Resolve review comments
2020-08-23 15:08:02 +02:00
Craftplacer
48bdbb0cfb
Use existing field in Editor
2020-08-15 23:46:10 +02:00
Craftplacer
c4a7fac760
Add required parameters and other various changes
2020-08-15 22:03:24 +02:00
Dean Herbert
e96e558728
Fix reversing scroll direction not always behaving as expected
2020-07-17 16:03:23 +09:00
Dean Herbert
d18eb663b1
Add tweening seek support to EditorClock
2020-05-22 16:47:52 +09:00
Dean Herbert
dd09d7830d
Cache and resolve editor clock as EditorClock in all cases
2020-05-22 16:44:06 +09:00
smoogipoo
e1142b424d
Fix test failures
2020-04-22 18:14:21 +09:00
smoogipoo
9c22d2f1dd
Use platform bindings for editor actions
2020-04-22 17:41:24 +09:00
smoogipoo
9e2be6f2f4
Remove bindable to promote one-way access
2020-04-16 13:25:08 +09:00
smoogipoo
ce21cfbb03
Use bindables in menu items
2020-04-15 16:17:34 +09:00
smoogipoo
14eca3655b
Add change state handling to the editor
2020-04-09 21:22:07 +09:00
Dan Balasescu
f390c1995d
Apply comment suggestions
...
Co-Authored-By: Dean Herbert <pe@ppy.sh>
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-16 11:29:28 +09:00
smoogipoo
c33ca6e99c
Decorate usages with exception management
2020-03-13 14:28:11 +09:00
Dean Herbert
9557a2cd96
Use object initialiser
2020-02-25 20:52:33 +09:00
Dean Herbert
d6046abe70
Only expose save for now
2020-02-25 18:59:16 +09:00
Dean Herbert
575946d923
Expose save and export options in editor to non-dekstop platforms
2020-02-23 20:47:14 +09:00
Dean Herbert
96986bf5fc
Remove beat divisor from ctor and use DI instead
2020-02-05 17:48:21 +09:00
Dean Herbert
63c595ed97
Make EditorBeatmap a component and move UpdateHitObject to it
2020-02-05 17:48:21 +09:00
Dean Herbert
58654f28b6
Fix beat snap implementation being incorrect
2020-01-28 12:48:24 +09:00
Dean Herbert
e4702ffe9e
Fix editor rate adjustment polluting global beatmap rate
2020-01-24 13:10:02 +09:00
Dean Herbert
ccf911884b
Remove passed in BaetDivisor
2020-01-23 15:31:56 +09:00
Dean Herbert
098d643955
Move beat snapping to its own interface
2020-01-23 14:39:56 +09:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
smoogipoo
e49701a215
Save before exporting
2020-01-15 13:48:28 +09:00
smoogipoo
c25fefa3ca
Add beatmap package export
2020-01-15 13:44:46 +09:00
smoogipoo
b51575b433
Add temporary keybind for saving
2020-01-14 19:24:53 +09:00
smoogipoo
ea7510d2f5
Rename menu option
2020-01-14 19:24:53 +09:00
smoogipoo
a255832195
Add beatmapmanager method for saving
2020-01-14 19:24:53 +09:00
smoogipoo
8c378dc625
Move EditorBeatmap construction/conversion to Editor
2019-12-30 14:51:14 +09:00
Dean Herbert
606bd33aa6
Use beatmap background in editor
2019-12-12 13:04:32 +09:00
Dean Herbert
b37bf4ea01
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
2019-11-12 10:44:53 +09:00
Dean Herbert
c70c05c896
Less sickening parallax ( #6743 )
...
Less sickening parallax
2019-11-08 19:15:25 +09:00
Dean Herbert
5699f3e22b
Seek to the first hitobject when entering the editor ( #6766 )
...
Seek to the first hitobject when entering the editor
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-08 19:15:08 +09:00
Dean Herbert
a849bc0746
Move implementation into resetTrack for safety
2019-11-08 18:51:01 +09:00
smoogipoo
e904928314
Seek to first hitobject when entering editor
2019-11-08 17:42:19 +09:00
smoogipoo
eb9fff96ba
Read default beat divisor from beatmap
2019-11-08 17:22:58 +09:00
smoogipoo
abb3a6ca5b
Initial right click context menu implementation
2019-11-08 13:36:17 +09:00
Dean Herbert
aaa06396f0
Reduce editor parallax
2019-11-06 18:11:56 +09:00
Dean Herbert
07286c0cfc
Fix editor's clock not being processed unless composer is loaded
2019-10-18 18:21:53 +09:00
Dean Herbert
3dd2b18ff0
Make EditorScreen abstract
2019-10-09 16:04:58 +09:00
Dean Herbert
63bf8ff832
Better signify under construction screens in editor
2019-10-08 14:32:48 +09:00
Dean Herbert
ad873b542a
Simplify editor logic
2019-07-11 00:22:40 +09:00
Desconocidosmh
100d15e651
Move reseting tempo to Editor
2019-07-10 10:43:02 +02:00
Oskar Solecki
3472979d0b
Make sure exiting editor doesn't unpause the music
2019-07-09 12:53:40 +02:00
Oskar Solecki
8f7476e9cc
Remove unused stuff
2019-07-09 00:26:57 +02:00
Oskar Solecki
a4957909b4
Merge branch 'master' into Fix-music-playing-while-exiting-from-editor
2019-07-09 00:11:29 +02:00
Desconocidosmh
338371c3fc
Fix music playing while exiting from editor
2019-07-09 00:08:18 +02:00
Desconocidosmh
84cadc688a
Change method name
2019-07-07 17:11:54 +02:00
Desconocidosmh
1a117d1511
Closes #5277
2019-07-07 17:05:53 +02:00
Dean Herbert
fa879b4b60
Add a note explaining why manual handling is required
2019-06-30 20:47:09 +09:00
Unknown
5b26ef75b1
allow exiting editor again
2019-06-30 12:31:31 +02:00
smoogipoo
8c96e4c1fa
Move back button to OsuGame
2019-06-25 18:33:08 +09:00
Dean Herbert
20b43c20c8
Rename variables to remove redundant "screen" terminology
2019-06-12 16:33:15 +09:00
Lucas A
15893bbb75
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
2019-06-11 19:41:48 +02:00
Lucas A
55663b3576
Nest all UserActivities into UserActivity
2019-05-12 17:38:02 +02:00
Lucas A
a5f758b977
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-07 18:27:14 +02:00
smoogipoo
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Lucas A
d5d31282e5
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
2019-05-05 20:55:42 +02:00
Lucas A
5d4aa5a12e
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
2019-05-02 20:51:19 +02:00
Lucas A
7e42068a14
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-28 19:48:35 +02:00
smoogipoo
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
Lucas A
da5d6cb1d4
Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
2019-04-12 22:54:35 +02:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
d10ad3c8a7
Fix warnings
2019-02-28 18:59:05 +09:00
Shane Woolcock
ce17e37c74
Conditionally add some UI elements only on desktop
...
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
smoogipoo
91302ea0bc
Merge remote-tracking branch 'origin/master' into iscreen
...
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728
Move toolbar showing and overlay activation to OsuGame
...
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
smoogipoo
bc3fcb87b7
Use input events rather than scene graph traversals
2018-11-30 15:47:55 +09:00
Dean Herbert
0ee5a5bdb4
Add support for keyboard seeking in the editor
2018-11-30 14:57:25 +09:00
Dan Balasescu
b446a73c0c
Add brackets
...
Co-Authored-By: peppy <pe@ppy.sh>
2018-11-23 10:06:06 +09:00
Dean Herbert
10047e6815
Adjust tick-based wheel control to be more correct
2018-11-22 20:13:40 +09:00
Dean Herbert
a48c26d999
Fix precision scroll events being handled incorrectly by editor
2018-11-22 19:40:44 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
e9e50f41fb
Use Name/NameScreen format
2018-11-07 13:04:17 +09:00
smoogipoo
52f4923c8e
Remove intermediate Screens namespace
2018-11-06 18:28:22 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Dean Herbert
5c63b3ddac
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
...
Always perform non-seeked scroll in the editor while audio is playing
2018-06-21 17:24:15 +09:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
smoogipoo
8c671f93fc
Always perform non-seeked scroll in the editor while audio is playing
2018-06-18 19:32:04 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
64eda27547
Update framework
2018-06-03 03:05:53 +09:00
smoogipoo
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
Dean Herbert
699f661b02
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
2018-05-25 19:07:30 +09:00
smoogipoo
f1ac84d95b
Fix base.CreateLocalDependencies sometimes not being called
2018-05-24 13:03:25 +09:00
