Dean Herbert
|
98fe5f78ee
|
Split setup screen up into sections (and use a SectionContainer)
|
2020-10-06 17:29:08 +09:00 |
|
Dean Herbert
|
28756d862b
|
Add placeholder text/colour when no beatmap background is specified yet
|
2020-10-06 17:21:01 +09:00 |
|
Dean Herbert
|
9d7880afda
|
Make SettingsItem conform to IHasCurrentValue
|
2020-10-06 17:18:54 +09:00 |
|
Dean Herbert
|
46f6e84a33
|
Fix disclaimer potentially running same code from two different threads
|
2020-10-06 12:33:57 +09:00 |
|
Dan Balasescu
|
783a463772
|
Merge branch 'master' into colourise-control-point-table
|
2020-10-05 20:47:06 +09:00 |
|
Dan Balasescu
|
54f1bcf2ce
|
Merge pull request #10313 from peppy/control-point-timeline-representation
Display all control point information on the main editor timeline
|
2020-10-05 20:46:52 +09:00 |
|
Dean Herbert
|
6bc0afdafb
|
Fix remaining conflicts
|
2020-10-05 20:09:18 +09:00 |
|
Dan Balasescu
|
051ea7eda9
|
Merge pull request #10329 from peppy/editor-file-drop-support
Add drag-drop support in editor setup screen for audio and background images
|
2020-10-05 20:05:41 +09:00 |
|
Dan Balasescu
|
ef8e6b3d96
|
Merge pull request #10310 from peppy/osu-selection-flip-rotate-buttons
Add buttons to flip/rotate the current selection by known amounts
|
2020-10-05 20:02:09 +09:00 |
|
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 |
|
Dean Herbert
|
cd794eaa65
|
Add basic selection box with drag handles
|
2020-09-29 20:08:56 +09:00 |
|
Dean Herbert
|
6e1ea00443
|
Don't apply gradient to non-duration objects
|
2020-09-29 17:34:50 +09:00 |
|
Dean Herbert
|
c47652c97a
|
Add gradient to hide subtractive colour issues
Good thing is looks better than without.
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
8d8d45a0c0
|
Add combo index display support
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
f16fc29071
|
Add combo colour display support
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
53b3d23842
|
Expose HitObjectComposer for other components in the Compose csreen to use
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
136843c8e4
|
Make DrawableStoryboardSample a SkinnableSound
Allows sharing pause logic with gameplay samples.
|
2020-09-29 14:25:39 +09:00 |
|
Dean Herbert
|
74e74e1c31
|
Fix pause loop sound not working because paused
|
2020-09-29 14:20:41 +09:00 |
|
Dean Herbert
|
c5f6b77bba
|
Add missing cached type
|
2020-09-29 13:42:17 +09:00 |
|
Dean Herbert
|
d6f3beffb6
|
Use existing bindable flow instead
|
2020-09-29 12:50:17 +09:00 |
|
Dean Herbert
|
585b857a0c
|
Handle paused state correctly
|
2020-09-29 12:17:38 +09:00 |
|
Dean Herbert
|
4f0c0ea5f9
|
Fix hit samples playing while paused / seeking in the editor
|
2020-09-28 18:17:47 +09:00 |
|
Dean Herbert
|
fd58a24183
|
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
|
2020-09-28 17:45:48 +09:00 |
|
Dan Balasescu
|
2f5a2d3bba
|
Merge pull request #10277 from peppy/editor-implicit-autoplay
Add autoplay support to editor
|
2020-09-28 17:41:26 +09:00 |
|
Dan Balasescu
|
89c8fca3fa
|
Merge pull request #10270 from peppy/editor-fix-noop-states-saving
Avoid saving state changes if nothing has changed (via binary comparison)
|
2020-09-28 17:03:50 +09:00 |
|
Dan Balasescu
|
06ab33645e
|
Merge branch 'master' into editor-implicit-autoplay
|
2020-09-28 16:43:08 +09:00 |
|
Dan Balasescu
|
5cceb3c724
|
Merge pull request #10273 from peppy/editor-fix-missing-update-after-drag
Trigger a hitobject update after blueprint drag ends
|
2020-09-28 16:34:23 +09:00 |
|
Dean Herbert
|
7949eabaac
|
Remove left-over using
|
2020-09-28 15:49:45 +09:00 |
|
Dean Herbert
|
d9ac5866b6
|
Merge branch 'editor-default-hit-sample' into editor-implicit-autoplay
|
2020-09-28 15:48:37 +09:00 |
|
Dean Herbert
|
a4e9c85333
|
Trigger a hitobject update after blueprint drag ends
|
2020-09-28 15:37:06 +09:00 |
|
Dean Herbert
|
0ae2266b82
|
Fix new placement hitobjects in the editor not getting the default sample added
|
2020-09-28 15:36:13 +09:00 |
|
Dean Herbert
|
1aa8b400d4
|
Avoid unnecessary object updates from SelectionHandlers
|
2020-09-28 15:33:49 +09:00 |
|
Dean Herbert
|
3cf430f494
|
Avoid saving state changes if nothing has changed (via binary comparison)
|
2020-09-28 15:30:51 +09:00 |
|
smoogipoo
|
a07597c369
|
Adjust displays to use new results/orderings
|
2020-09-25 20:22:59 +09:00 |
|
Dean Herbert
|
b2261f03e2
|
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
|
2020-09-25 20:21:35 +09:00 |
|
Dan Balasescu
|
2280568d27
|
Merge pull request #10245 from peppy/editor-sample-addition-buttons
Add sample toggle buttons to toolbox
|
2020-09-25 20:09:10 +09:00 |
|
Dan Balasescu
|
93a137ed84
|
Merge pull request #10234 from peppy/editor-load-audio
Add audio track selection to editor setup screen
|
2020-09-25 19:58:23 +09:00 |
|
Dan Balasescu
|
cc41b4bb9e
|
Merge branch 'master' into editor-sample-addition-buttons
|
2020-09-25 19:39:12 +09:00 |
|
Dean Herbert
|
204024c76e
|
Merge branch 'master' into editor-load-audio
|
2020-09-25 18:32:51 +09:00 |
|
Dean Herbert
|
8e6bf516d9
|
Merge branch 'master' into editor-ternary-buttons
|
2020-09-25 18:30:59 +09:00 |
|
Dean Herbert
|
dbfa05d3b3
|
Fix placement object not getting updated with initial state
|
2020-09-25 18:00:17 +09:00 |
|
Dean Herbert
|
b561429f92
|
Add toolbar toggle buttons for hit samples
|
2020-09-25 17:53:41 +09:00 |
|
Dean Herbert
|
346d14d40b
|
Rename variables to match
|
2020-09-25 17:45:19 +09:00 |
|
Dean Herbert
|
22511c36c3
|
Ensure toggles are not instantiated more than once for safety
|
2020-09-25 17:43:09 +09:00 |
|
Dean Herbert
|
51cc644b7b
|
Fix set access to SelectionHandler
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2020-09-25 17:42:49 +09:00 |
|
Dean Herbert
|
b8e9f19b92
|
Move common HitSampleInfo lookup to static method
|
2020-09-25 17:30:31 +09:00 |
|
Dean Herbert
|
98c6027352
|
Remove unused using
|
2020-09-25 17:07:58 +09:00 |
|
Dean Herbert
|
ae68dcd962
|
Add ternary toggle buttons to editor toolbox selection
|
2020-09-25 16:38:12 +09:00 |
|
Dean Herbert
|
0f8551e9ea
|
Merge branch 'editor-ternary-states' into new-combo-toggle
|
2020-09-25 15:36:33 +09:00 |
|
Dean Herbert
|
a859fe78ee
|
Expose update ternary state method and use better state determination function
|
2020-09-25 15:32:36 +09:00 |
|
Dean Herbert
|
50290f3cb4
|
Rework ternary states to fix context menus not updating after already displayed
|
2020-09-25 15:10:13 +09:00 |
|