Dean Herbert
|
e20c28f166
|
Merge pull request #10306 from smoogipoo/dynamic-difficulty-icon
|
2020-10-05 19:40:18 +09:00 |
|
Dan Balasescu
|
a920342a09
|
Merge branch 'master' into editor-file-drop-support
|
2020-10-05 19:28:44 +09:00 |
|
Dan Balasescu
|
2b824787c1
|
Guard against potential nullref
|
2020-10-05 19:28:13 +09:00 |
|
Dean Herbert
|
ba55256fb4
|
Merge branch 'master' into control-point-timeline-representation
|
2020-10-05 19:24:28 +09:00 |
|
Dan Balasescu
|
6d50a1ed7d
|
Merge branch 'master' into osu-selection-flip-rotate-buttons
|
2020-10-05 19:17:33 +09:00 |
|
Dan Balasescu
|
08f7b18dbe
|
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
|
2020-10-05 19:17:19 +09:00 |
|
Dan Balasescu
|
2df5ea8ba8
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-05 18:47:17 +09:00 |
|
Dean Herbert
|
2ed43c14f8
|
Merge branch 'master' into editor-file-drop-support
|
2020-10-05 17:48:06 +09:00 |
|
Dean Herbert
|
365a38e92f
|
Merge branch 'master' into dynamic-difficulty-icon
|
2020-10-05 17:37:01 +09:00 |
|
Dan Balasescu
|
16a599850c
|
Merge branch 'master' into more-timeline-toggles
|
2020-10-05 17:33:18 +09:00 |
|
Dean Herbert
|
d43ea68709
|
Merge branch 'master' into fix-gameplay-seek-sample-pausing
|
2020-10-05 16:21:28 +09:00 |
|
Dan Balasescu
|
d3e1da5922
|
Merge branch 'master' into editor-timing-screen-change-handling
|
2020-10-05 15:40:43 +09:00 |
|
Dan Balasescu
|
39f1ceb2ad
|
Merge pull request #10366 from peppy/fix-editor-save-new-beatmap
Fix editor persisting new beatmap even when user chooses not to
|
2020-10-05 14:38:43 +09:00 |
|
Dean Herbert
|
e4710f82ec
|
Fix sample disabled status not being updated correctly from seek state
|
2020-10-05 14:27:51 +09:00 |
|
Shane Woolcock
|
a483dfd2d7
|
Allow confineMouseTracker to be null
|
2020-10-05 11:54:39 +10:30 |
|
Shane Woolcock
|
5859755886
|
Use current OverlayActivationMode to determine confine logic
|
2020-10-05 11:11:46 +10:30 |
|
Shane Woolcock
|
4b6f893408
|
Merge branch 'master' into confine-during-gameplay
# Conflicts:
# osu.Game/Configuration/OsuConfigManager.cs
# osu.Game/OsuGame.cs
# osu.Game/Screens/Play/Player.cs
|
2020-10-05 10:23:37 +10:30 |
|
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 |
|
Bartłomiej Dach
|
6f2b991b32
|
Ensure true gameplay rate is finite when paused externally
|
2020-10-04 14:54:51 +02:00 |
|
Dean Herbert
|
ec30ca24c5
|
Merge pull request #10343 from bdach/hitresult-miss-fixes
Replace direct references to HitResult.Miss wherever applicable
|
2020-10-04 21:36:26 +09:00 |
|
Bartłomiej Dach
|
a366591d6d
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-04 13:28:59 +02:00 |
|
Bartłomiej Dach
|
7957773d58
|
Merge branch 'master' into more-timeline-toggles
|
2020-10-04 12:53:10 +02:00 |
|
Dan Balasescu
|
06b55c6aba
|
Merge pull request #10326 from peppy/editor-less-autoplay-regeneration
Only regenerate autoplay on editor state change
|
2020-10-03 20:10:29 +09:00 |
|
Bartłomiej Dach
|
1f0620ffd4
|
Replace assignment references to HitResult.Miss with Judgement.MinResult
|
2020-10-02 23:31:24 +02:00 |
|
Bartłomiej Dach
|
2b1ef16f89
|
Replace comparison references to HitResult.Miss with IsHit
|
2020-10-02 23:31:24 +02:00 |
|
Dean Herbert
|
dab50bff6f
|
Protect "use current time" button against crash when no timing point is selected
|
2020-10-03 01:27:42 +09:00 |
|
Dean Herbert
|
0d3a95d8fc
|
Remove unnecessary string interpolation
|
2020-10-02 19:54:13 +09:00 |
|
Dean Herbert
|
2f15d558a3
|
Merge branch 'master' into control-point-timeline-representation
|
2020-10-02 19:53:25 +09:00 |
|
Dean Herbert
|
fcc6cb36e4
|
Change text colour to black
|
2020-10-02 18:50:47 +09:00 |
|
Dean Herbert
|
66f5187e6a
|
Remove redundant access permission
|
2020-10-02 18:20:59 +09:00 |
|
Dean Herbert
|
519c3ac2bd
|
Change SliderWithTextBoxInput to transfer on commit
|
2020-10-02 17:59:57 +09:00 |
|
Dean Herbert
|
9fc9009dbe
|
Add change handling for sample section
|
2020-10-02 17:59:47 +09:00 |
|
Dean Herbert
|
08faef694b
|
Add change handling for difficulty section
|
2020-10-02 17:58:27 +09:00 |
|
Dean Herbert
|
693a4ff474
|
Add change handling for effects section
|
2020-10-02 17:58:23 +09:00 |
|
Dean Herbert
|
98fd661b23
|
Add change handling for timing section
|
2020-10-02 17:55:47 +09:00 |
|
Dean Herbert
|
c1c5b5da8e
|
Push state change on control point group addition / removal
|
2020-10-02 17:49:38 +09:00 |
|
Dean Herbert
|
436cc572d3
|
Expose ChangeHandler.SaveState via interface
|
2020-10-02 17:37:29 +09:00 |
|
Dean Herbert
|
00eed29527
|
Don't update time if it hasn't changed
|
2020-10-02 17:35:41 +09:00 |
|
Dean Herbert
|
fc920a8899
|
Add change handler logic
|
2020-10-02 17:32:34 +09:00 |
|
Dean Herbert
|
2a02f8f3f3
|
Add support for background changing
|
2020-10-02 16:52:45 +09:00 |
|
Dean Herbert
|
b7aba19441
|
Add audio file drag-drop support at editor setup screen
|
2020-10-02 16:31:11 +09:00 |
|
Dean Herbert
|
f3c8cd91f4
|
Remove unused method
|
2020-10-02 16:14:27 +09:00 |
|
Dean Herbert
|
0cb3926e1d
|
Add event on EditorChangeHandler state change
|
2020-10-02 15:44:34 +09:00 |
|
Dean Herbert
|
2698dc513f
|
Add basic textbox error handling
|
2020-10-02 15:33:33 +09:00 |
|
Dean Herbert
|
959c8730f6
|
Add settings section from TimingPointGroups on timing screen
|
2020-10-02 15:30:32 +09:00 |
|
Dean Herbert
|
94996f2cc0
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-01 21:09:52 +09:00 |
|
Dan Balasescu
|
73edb87363
|
Merge pull request #10303 from peppy/more-textbox-entry
Add textbox entry for speed multiplier and volume
|
2020-10-01 20:42:14 +09:00 |
|
Dean Herbert
|
5ad2944e26
|
Fix ticks displaying higher than control point info
|
2020-10-01 19:31:41 +09:00 |
|
Dean Herbert
|
e96e30a19d
|
Move control point colour specifications to common location and use for formatting timing screen table
|
2020-10-01 19:29:34 +09:00 |
|
Dean Herbert
|
fcccce8b4e
|
Use pink for sample control points to avoid clash with waveform blue
|
2020-10-01 19:03:17 +09:00 |
|
Dean Herbert
|
589a26a149
|
Ensure stable display order for control points in the same group
|
2020-10-01 18:59:35 +09:00 |
|
Dean Herbert
|
b75c202a7e
|
Add sample control point display in timeline
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
0bced34272
|
Add visualisation of bpm (timing) changes to timeline
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
70931abcb0
|
Separate out timeline control point display from summary timeline display
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
70d475be1f
|
Fix elements appearing in front of hitobjects
|
2020-10-01 18:54:59 +09:00 |
|
Dean Herbert
|
00a19b4879
|
Also add toggle for ticks display
|
2020-10-01 18:16:49 +09:00 |
|
Dean Herbert
|
b654396a4c
|
Move ticks display to timeline
|
2020-10-01 18:16:30 +09:00 |
|
Dean Herbert
|
0d03084cdc
|
Move control point display to the base timeline class
We want them to display on all screens with a timeline as they are quite
useful in all cases.
|
2020-10-01 18:16:12 +09:00 |
|
Dean Herbert
|
60e6cfa45c
|
Avoid recreating child hierarchy when unnecessary
|
2020-10-01 16:36:03 +09:00 |
|
Dean Herbert
|
1aff263419
|
Split out classes and simplify construction of buttons
|
2020-10-01 16:34:34 +09:00 |
|
Dean Herbert
|
db1ad4243e
|
Remove need for ScaleDragHandle class
|
2020-10-01 16:27:42 +09:00 |
|
Dean Herbert
|
4e6a505a99
|
Add new icons and tooltips
|
2020-10-01 16:25:40 +09:00 |
|
Dean Herbert
|
78c5d57074
|
Add flip event flow and stop passing raw input events to handle methods
|
2020-10-01 16:25:29 +09:00 |
|
Dean Herbert
|
02f14ab4b0
|
Rename operation start/end to be more encompassing
|
2020-10-01 16:24:09 +09:00 |
|
Dean Herbert
|
b1f2bdd579
|
Add missing xmldoc
|
2020-10-01 13:47:49 +09:00 |
|
Dean Herbert
|
e0a0902a15
|
Ensure textbox always reverts to sane state on out-of-range failures
|
2020-10-01 13:06:24 +09:00 |
|
Dean Herbert
|
9d07dce5e4
|
Merge pull request #10251 from smoogipoo/additional-hit-results
|
2020-10-01 12:19:48 +09:00 |
|
Bartłomiej Dach
|
10ae93cc2e
|
Merge branch 'master' into more-textbox-entry
|
2020-09-30 23:54:00 +02:00 |
|
smoogipoo
|
fde00d3431
|
Make DifficultyIcon support dynamic star rating
|
2020-10-01 00:53:25 +09:00 |
|
Dan Balasescu
|
148e2769c8
|
Merge pull request #10304 from peppy/fix-control-point-bindable-updates
Fix control point timeline display not updating with changes
|
2020-09-30 23:30:35 +09:00 |
|
Dean Herbert
|
367b35bb10
|
Merge branch 'master' into fix-storyboard-sample-pausing
|
2020-09-30 22:42:26 +09:00 |
|
Dan Balasescu
|
6def54548b
|
Merge branch 'master' into fix-control-point-bindable-updates
|
2020-09-30 21:35:36 +09:00 |
|
Dan Balasescu
|
6dab5c2ceb
|
Merge branch 'master' into fix-editor-silence-on-seek
|
2020-09-30 21:33:15 +09:00 |
|
Dan Balasescu
|
7eb45990a4
|
Merge pull request #10302 from peppy/timing-screen-clean-up
Fix timing screen tests and add simple view of control points to timeline
|
2020-09-30 21:33:07 +09:00 |
|
Dan Balasescu
|
3af7e59103
|
Merge pull request #10289 from peppy/timeline-ux-improvements
Improve the usability of the editor timeline with combo colour and indices
|
2020-09-30 20:32:55 +09:00 |
|
Dean Herbert
|
fa742a2ef1
|
Update to consume framework fixes
|
2020-09-30 20:28:02 +09:00 |
|
Dean Herbert
|
df9d4bc2f0
|
Merge branch 'master' into fix-control-point-bindable-updates
|
2020-09-30 20:27:25 +09:00 |
|
Dean Herbert
|
a11c74d600
|
Update to consume framework fixes
|
2020-09-30 20:27:02 +09:00 |
|
Dean Herbert
|
f9d6aed2df
|
Merge branch 'master' into timing-screen-clean-up
|
2020-09-30 20:26:02 +09:00 |
|
Dean Herbert
|
5242f5648d
|
Fix timeline control point display not updating with changes
|
2020-09-30 18:34:13 +09:00 |
|
Dean Herbert
|
44fc0c6723
|
Fix default value of bpm being too high
|
2020-09-30 18:08:55 +09:00 |
|
Dean Herbert
|
bc943dee53
|
Add textbox entry for speed multiplier and volume
|
2020-09-30 17:52:12 +09:00 |
|
Dean Herbert
|
b0f8e11bd4
|
Fix incorrect caching
|
2020-09-30 17:34:14 +09:00 |
|
Dean Herbert
|
3422db1bb2
|
Use top-left colour for deciding the text colour (gradient was added in some cases)
|
2020-09-30 17:10:22 +09:00 |
|
Dean Herbert
|
7f579850dd
|
Merge branch 'master' into fix-editor-silence-on-seek
|
2020-09-30 17:03:23 +09:00 |
|
Dean Herbert
|
698042268f
|
Show control points in timing screen timeline
|
2020-09-30 17:00:42 +09:00 |
|
Dean Herbert
|
5b200a8ca4
|
Change default zoom of timing screen timeline to most zoomed out
|
2020-09-30 16:39:27 +09:00 |
|
Dean Herbert
|
a40c2ea5ee
|
Simplify control point group binding/update logic
|
2020-09-30 16:02:22 +09:00 |
|
Dean Herbert
|
414c40d298
|
Reverse inheritance order of SkinnableSound's pause logic
|
2020-09-30 15:45:14 +09:00 |
|
Dan Balasescu
|
466d37a450
|
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
|
2020-09-30 15:43:56 +09:00 |
|
Dean Herbert
|
59ce9fcab9
|
Merge branch 'master' into fix-editor-silence-on-seek
|
2020-09-30 15:35:55 +09:00 |
|
Dean Herbert
|
ae9e884a48
|
Fix header casing
|
2020-09-30 15:35:25 +09:00 |
|
Dean Herbert
|
d6c88ecd69
|
Merge branch 'master' into osu-selection-scaling
|
2020-09-30 15:09:04 +09:00 |
|
Dean Herbert
|
f1298bed79
|
Combine scale operations and tidy up scale drag handle construction
|
2020-09-30 15:08:56 +09:00 |
|
Dean Herbert
|
39b55a85df
|
Move a lot of the implementation to base SelectionHandler
|
2020-09-30 13:52:57 +09:00 |
|
Dean Herbert
|
f2c26c0927
|
Move information text underneath the selection box
|
2020-09-30 13:07:24 +09:00 |
|
Dean Herbert
|
1386c9fe66
|
Standardise time display formats across the editor
|
2020-09-30 12:45:43 +09:00 |
|
Dean Herbert
|
a2e2cca396
|
Add proper change handler support
|
2020-09-29 20:08:56 +09:00 |
|
Dean Herbert
|
0a10e40ce0
|
Add scaling support to osu! editor
|
2020-09-29 20:08:56 +09:00 |
|