Dan Balasescu
df07ca445f
Merge branch 'master' into legacy-SpinnerNoBlink
2020-10-01 20:34:23 +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
a9f76e859f
Merge pull request #10292 from smoogipoo/fix-score-recalc
2020-10-01 18:50:13 +09:00
Dean Herbert
ffc1e9c358
Update framework
2020-10-01 18:23:38 +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
Dan Balasescu
3a81602d0c
Merge pull request #10286 from peppy/fix-hitobject-sample-stuck-on-future-seek
...
Fix HitObject samples getting stuck in a playing state on seeking far into the future
2020-10-01 18:08:17 +09:00
Dean Herbert
a1b8ced46d
Merge branch 'master' into fix-score-recalc
2020-10-01 17:00:20 +09:00
Dean Herbert
1ec96e1bb1
Merge branch 'master' into adjust-hp-increases
2020-10-01 16:58:29 +09:00
Dean Herbert
482c23901b
Check RequestedPlaying state before allowing scheduled resume of looped sample
2020-10-01 16:54:58 +09:00
Dean Herbert
b7ac779760
Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek
2020-10-01 16:46:14 +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
smoogipoo
7890319802
Merge branch 'master' into adjust-hit-result-types
2020-10-01 16:19:07 +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
61e62929ee
Apply changes in line with framework event logic update
2020-10-01 13:06:01 +09:00
smoogipoo
cb6b35116a
Merge branch 'master' into scoring-standardisation
2020-10-01 12:28:51 +09:00
smoogipoo
c9f38f7bb6
Add obsoletion notice
2020-10-01 12:28:33 +09:00
Dean Herbert
9d07dce5e4
Merge pull request #10251 from smoogipoo/additional-hit-results
2020-10-01 12:19:48 +09:00
smoogipoo
3a26bd8d9b
Adjust obsoletion + xmldoc of NumericResultFor()
2020-10-01 12:14:16 +09:00
smoogipoo
806d8b4b1d
Make scoring int-based again
2020-10-01 12:13:24 +09:00
Bartłomiej Dach
10ae93cc2e
Merge branch 'master' into more-textbox-entry
2020-09-30 23:54:00 +02:00
Ganendra Afrasya
ca9f5b447e
Fix UserListPanel background position
2020-10-01 02:02:27 +07:00
smoogipoo
2213db2088
Use the given ruleset by default
2020-10-01 00:59:41 +09:00
smoogipoo
fde00d3431
Make DifficultyIcon support dynamic star rating
2020-10-01 00:53:25 +09:00
smoogipoo
917e8fc3ba
Add difficulty rating to StarDifficulty
2020-10-01 00:53:01 +09:00
Dan Balasescu
7e34ce839e
Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek
2020-09-30 23:31:03 +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
4b70fe8585
Merge branch 'fix-storyboard-sample-pausing' into fix-hitobject-sample-stuck-on-future-seek
2020-09-30 22:46:09 +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
smoogipoo
77651be2ca
Remove padding from HitResult
2020-09-30 21:32:50 +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
fab11a8241
Update framework
2020-09-30 18:36:40 +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
e760ed8e01
Fix scroll wheel being handled by base test scene
2020-09-30 16:39:02 +09:00
Dean Herbert
a40c2ea5ee
Simplify control point group binding/update logic
2020-09-30 16:02:22 +09:00
Dean Herbert
6cceb42ad5
Remove unused DI resolution
2020-09-30 15:50:53 +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
smoogipoo
297168ecc4
Fix scores sometimes not being re-standardised correctly
2020-09-29 19:06:09 +09:00
smoogipoo
cc9fa4675c
Adjust HP increases
2020-09-29 17:59:42 +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
smoogipoo
91262620d3
Remove XMLDocs from Ok/Perfect hit results
2020-09-29 17:17:06 +09:00
smoogipoo
f439c1afbc
Make osu/taiko/catch use Ok+Great
2020-09-29 17:16:55 +09:00
smoogipoo
bad48d6d44
Merge branch 'master' into scoring-standardisation
2020-09-29 16:33:38 +09:00
smoogipoo
bc8f6a58fd
Update PF/SD with new hit results
2020-09-29 16:33:38 +09:00
smoogipoo
31fae045fa
Update judgement processors with new hit results
2020-09-29 16:33:38 +09:00
smoogipoo
a1394c1830
Fix a few missed judgements
2020-09-29 16:33:38 +09:00
smoogipoo
6264a01ecc
Add guard against using the wrong hit result
2020-09-29 16:33:38 +09:00
smoogipoo
519f376e7b
Standardise Judgement across all rulesets
2020-09-29 16:33:38 +09:00
smoogipoo
07226c79b6
Add xmldocs
2020-09-29 16:33:23 +09:00
smoogipoo
cee58e89a3
Pad hit results
2020-09-29 16:32:02 +09:00
Dean Herbert
5d1c377379
Fix HitObject samples getting stuck in a playing state on seeking far into the future
2020-09-29 15:07:55 +09:00
smoogipoo
1a70002cdd
Split ignore into hit/miss
2020-09-29 14:41:50 +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
Max Hübner
54852991f3
Move SpinnerNoBlink to OsuSkinConfiguration
2020-09-28 12:24:30 +02: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
Dan Balasescu
ef195015c0
Merge pull request #10275 from peppy/frame-stability-attach-without-enabling
...
Allow attaching a replay to a FrameStabilityContainer when FrameStablePlayback is off
2020-09-28 16:33:55 +09:00
Dean Herbert
7949eabaac
Remove left-over using
2020-09-28 15:49:45 +09:00
Dean Herbert
524c2b678c
Forcefully regenerate autoplay on editor changes
2020-09-28 15:48:42 +09:00
Dean Herbert
ff7c904996
Add autoplay mod in editor specific ruleset construction
2020-09-28 15:48:42 +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
e924a83c12
Merge branch 'editor-fix-missing-update-after-drag' into editor-implicit-autoplay
2020-09-28 15:48:36 +09:00
Dean Herbert
e8220cf1b6
Allow attaching a replay to a FrameStabilityContainer when FrameStablePlayback is off
2020-09-28 15:47:11 +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
Dan Balasescu
600d37cc04
Merge pull request #10254 from peppy/fix-pancake-scrollbar
...
Fix scroll container's scrollbar not respecting minimum size on first resize
2020-09-28 13:31:21 +09:00
Max Hübner
e7d0456454
Add SpinnerNoBlink to LegacySettings
2020-09-26 16:25:17 +02:00
smoogipoo
9a24346a00
Fix HP drain edgecase potentially causing insta-fails
2020-09-25 23:29:40 +09:00
smoogipoo
4bcc3ca828
Add AffectsAccuracy extension
2020-09-25 22:16:14 +09:00
smoogipoo
2517fffb7e
Fix incorrect display in beatmap overlay table
2020-09-25 20:48:28 +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
smoogipoo
1c4baa4e2a
Add bonus hit results and orderings
2020-09-25 20:11:27 +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
Dan Balasescu
f588cf459d
Merge pull request #10243 from peppy/editor-ternary-buttons
...
Add ternary toggle buttons to editor toolbox selection
2020-09-25 19:37:18 +09:00
Dan Balasescu
8c45786841
Merge pull request #10247 from peppy/fix-editor-missed-state-changes
...
Forcefully re-apply DrawableHitObject state transforms on post-load DefaultsApplied
2020-09-25 19:00:45 +09:00
Dan Balasescu
3f0c3fc9ae
Merge branch 'master' into editor-ternary-buttons
2020-09-25 18:57:10 +09:00
Dean Herbert
d25e058492
Merge branch 'master' into editor-load-audio
2020-09-25 18:52:05 +09:00
Dan Balasescu
af93b56c32
Merge pull request #10246 from peppy/update-framework
...
Update framework
2020-09-25 18:42:12 +09:00
Dean Herbert
8b255f4579
Fix test failures
...
The issue was the ArchiveModelManager change; the test local change is
just there because it makes more sense to run for every test in that
scene.
2020-09-25 18:40:22 +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
59bfa08684
Forcefully re-apply DrawableHitObject state transforms on post-load DefaultsApplied
2020-09-25 18:26:54 +09:00
Dean Herbert
4cc02abc76
Update framework
2020-09-25 18:11:49 +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
Dan Balasescu
7b09f73fe5
Merge branch 'master' into new-combo-toggle
2020-09-25 17:33:12 +09:00
Dan Balasescu
e1fc8d76fb
Merge branch 'master' into editor-dont-block-keys-unnecessarily
2020-09-25 17:31:41 +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
Dan Balasescu
9b29c9e185
Merge branch 'master' into editor-ternary-states
2020-09-25 16:58:15 +09:00
Dean Herbert
b70a20e7f1
Avoid consuming keystrokes in editor when a modifier key is held down
2020-09-25 16:56:39 +09:00
Dean Herbert
da820c815e
Add shortcut keys to toolbox gorup titles
2020-09-25 16:46:06 +09:00
Dean Herbert
a6298c60eb
Fix button spacing
2020-09-25 16:44:37 +09:00
Dean Herbert
ae68dcd962
Add ternary toggle buttons to editor toolbox selection
2020-09-25 16:38:12 +09:00
Dan Balasescu
039e1b2032
Merge pull request #10217 from peppy/fix-taiko-editor-type-stats
...
Fix changing rim/strong types in taiko editor not applying correctly
2020-09-25 15:43:43 +09:00
Dean Herbert
0f8551e9ea
Merge branch 'editor-ternary-states' into new-combo-toggle
2020-09-25 15:36:33 +09:00
Dean Herbert
bac6515d09
Merge branch 'master' into editor-ternary-states
2020-09-25 15:35:52 +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
Dan Balasescu
f1efc0ba42
Merge pull request #10240 from peppy/fix-setup-textbox-commit
...
Ensure setup screen text boxes commit on losing focus
2020-09-25 14:58:26 +09:00
Dan Balasescu
69d057a8b3
Merge branch 'master' into fix-taiko-editor-type-stats
2020-09-25 14:53:47 +09:00
Dan Balasescu
e828cf1607
Merge branch 'master' into editor-load-audio
2020-09-25 14:49:54 +09:00
Dan Balasescu
440adc305d
Merge pull request #10233 from peppy/file-selector
...
Add a basic file selector with extension filtering support
2020-09-25 14:44:32 +09:00
Dan Balasescu
d9fee594ea
Merge pull request #10238 from peppy/fix-hoc-keyboard-shortcut-hard-crash
...
Fix hard crash on hitting an out of range key (Q~P)
2020-09-25 14:44:14 +09:00
Dean Herbert
7f9a5f5f0d
Ensure setup screen text boxes commit on losing focus
2020-09-25 14:25:24 +09:00
Dean Herbert
a6adf8334e
Use existing method to update combo state of selection
2020-09-25 14:19:35 +09:00
Dean Herbert
e009264f10
Add new combo toggle to main composer interface
2020-09-25 14:10:30 +09:00
Dean Herbert
bca774a0d4
Allow BlueprintContainer to specify toggles
2020-09-25 14:09:31 +09:00
Dean Herbert
3c191cfe25
Add basic xmldoc to HitObjectComposer
2020-09-25 14:08:47 +09:00
Dean Herbert
325bfdbf71
Fix hard crash on hitting an out of range key (Q~P)
2020-09-25 13:25:42 +09:00
Dean Herbert
26ba7d3100
Remove unused method (was moved to a more local location)
2020-09-25 13:20:19 +09:00
Dean Herbert
892d440ed0
Add fallback path for potential null ParentGameplayClock
2020-09-25 13:19:07 +09:00
Dan Balasescu
952e84396a
Merge branch 'master' into editor-object-object-snapping
2020-09-25 13:17:30 +09:00
Dean Herbert
7df8b5bce7
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-25 13:17:03 +09:00
Dean Herbert
ea971ecb90
Remove local file handling from SetupScreen
2020-09-25 13:16:30 +09:00
Dean Herbert
50ba320a51
Expand available file operations in ArchiveModelManager
2020-09-25 13:16:30 +09:00
Dean Herbert
71e1f981fe
Merge branch 'file-selector' into editor-load-audio
2020-09-25 12:44:00 +09:00
Dean Herbert
a890e5830d
Add more file icons
2020-09-25 12:42:28 +09:00
Dean Herbert
1b8b417b85
Merge branch 'master' into file-selector
2020-09-25 12:33:18 +09:00
Dean Herbert
f047ff10bf
Remove local specification for file selector search path
2020-09-25 12:30:05 +09:00
Dean Herbert
b1e72c311e
Add null check because we can
2020-09-25 12:28:41 +09:00
Dean Herbert
a17eac3692
Rename reload method to not mention beatmap unnecessarily
2020-09-25 12:27:08 +09:00
Dean Herbert
981585930d
Merge branch 'master' into editor-load-audio
2020-09-25 12:24:16 +09:00
Dean Herbert
44a6637c36
Use SingleOrDefault
2020-09-25 12:20:37 +09:00
Dean Herbert
90c4c172bf
Merge branch 'master' into fix-editor-screen-settings-remembering
2020-09-25 12:19:45 +09:00
Dean Herbert
b9196718b7
Merge branch 'master' into editor-object-object-snapping
2020-09-25 12:15:10 +09:00
Dean Herbert
c3df7e1fa8
Fix scroll container's scrollbar not respecting minimum size on first resize
2020-09-25 01:05:12 +09:00
Dean Herbert
dc85bcd470
Merge pull request #10229 from smoogipoo/fix-ruleset-disposal
...
Fix rulesets disposing game-wide texture store
2020-09-24 22:54:45 +09:00
Dean Herbert
011b176244
Add test coverage of audio track changing
2020-09-24 22:00:13 +09:00
Dean Herbert
cc9ae32811
Fix summary timeline not updating to new track length correctly
2020-09-24 21:05:29 +09:00
Dean Herbert
833ff1c1d7
Fix test failures due to editor dependency
2020-09-24 20:56:35 +09:00
Dean Herbert
7e7e2fd64a
Use bindable for track to fix rate adjustments not applying correctly
2020-09-24 20:56:35 +09:00
Dean Herbert
978f6edf38
Add basic track reloading support while inside the editor
2020-09-24 20:56:35 +09:00
Dean Herbert
65e6dd2ac3
Remove the previous audio file before adding a new one
2020-09-24 20:56:35 +09:00
Dean Herbert
4d714866cd
Add ability to actually import a new audio file to the beatmap / database
2020-09-24 20:56:35 +09:00
Dean Herbert
4b9581bca0
Add audio selection to song setup screen
2020-09-24 20:56:35 +09:00
Dean Herbert
937d5870b3
Add a basic file selector with extension filtering support
2020-09-24 20:54:25 +09:00
Dean Herbert
158d307126
Avoid destroying editor screens when changing between modes
2020-09-24 17:03:54 +09:00
Dan Balasescu
abec9224cf
Merge pull request #10230 from peppy/editor-toggle-shortcuts
...
Add ability to toggle editor toggles using keyboard shortcuts (Q~P)
2020-09-24 16:55:39 +09:00
Dan Balasescu
ad30c20b8c
Merge pull request #10227 from peppy/editor-negative-current-time
...
Fix editor not showing sign when time goes negative
2020-09-24 16:27:05 +09:00
Dean Herbert
44be0ab762
Add basic osu! object to object snapping
2020-09-24 16:24:35 +09:00
Dean Herbert
6ebea3f6f2
Add ability to toggle editor toggles using keyboard shortcuts (Q~P)
2020-09-24 16:24:25 +09:00
Dan Balasescu
f84b5087bd
Merge pull request #10226 from peppy/results-fix-relayout-misalignment
...
Fix score panel being incorrectly vertically aligned on screen resize
2020-09-24 15:50:31 +09:00
smoogipoo
62c2dbc310
Nest classes + make private
2020-09-24 14:33:43 +09:00
Dan Balasescu
02d8355321
Merge pull request #10224 from peppy/results-statistics-replay-button
...
Add more descriptive description and download button when statistics not available
2020-09-24 14:31:38 +09:00
smoogipoo
600b823a30
Fix game texture store being disposed by rulesets
2020-09-24 14:30:18 +09:00
Dean Herbert
33fad27ec2
Avoid API change to DrawableHitObject
2020-09-24 13:28:29 +09:00
Dean Herbert
00b0228b61
Merge branch 'master' into fix-taiko-editor-type-stats
2020-09-24 13:18:13 +09:00
Dean Herbert
9c074e0ffb
Fix editor not showing sign when time goes negative
2020-09-24 13:10:54 +09:00
Dean Herbert
5612357574
Fix score panel being incorrectly vertically aligned on screen resize
2020-09-24 12:49:32 +09:00
Dean Herbert
fda6e88dd3
Fix braces style
2020-09-24 12:39:08 +09:00
Dean Herbert
cb903ec9e2
Fix extended statistics not being vertically centered
2020-09-24 12:21:46 +09:00
Dean Herbert
f4d2c2684d
Add more descriptive description and download button when statistics not available
2020-09-24 12:21:08 +09:00
Dean Herbert
fb9d2cb05c
Merge pull request #10218 from peppy/update-framework
2020-09-23 21:45:36 +09:00
Dean Herbert
26d1c4322d
Merge pull request #10200 from peppy/fix-hit-object-container-unbinding
...
Fix HitObjectContainer not correctly unbinding from startTime fast enough
2020-09-23 21:17:31 +09:00
Dan Balasescu
37af9e767f
Merge branch 'master' into fix-taiko-change-handling
2020-09-23 19:47:29 +09:00
Dan Balasescu
d1e41e41f7
Merge pull request #10214 from peppy/new-combo-editor-toggle
...
Add the ability to toggle new combo state from composer context menu
2020-09-23 19:46:55 +09:00
Dean Herbert
e8d099c01d
Update framework
2020-09-23 19:28:20 +09:00
Dean Herbert
fee379b4b9
Reword xmldoc for legibility
2020-09-23 18:12:07 +09:00
Dean Herbert
9a0e5ac154
Handle type/strength changes from samples changes
2020-09-23 18:09:40 +09:00
Dean Herbert
ccb3ef5020
Merge branch 'new-combo-editor-toggle' into fix-taiko-change-handling
2020-09-23 17:08:27 +09:00
Dean Herbert
02201d0ec6
Fix incorrect cast logic
2020-09-23 17:08:25 +09:00
Dean Herbert
487fc2a2c6
Add missing change handler scopings to taiko context menu operations
2020-09-23 16:58:22 +09:00
Dean Herbert
2d67faeb72
Add xmldoc
2020-09-23 16:40:56 +09:00
Dean Herbert
a1ec167982
Add the ability to toggle new combo state from composer context menu
2020-09-23 16:38:16 +09:00
Joehu
c5b684bd2e
Fix typo in log when beatmap fails to load
2020-09-23 00:30:20 -07:00
Dan Balasescu
d6ae66384d
Merge branch 'master' into fix-hit-object-container-unbinding
2020-09-23 15:16:58 +09:00
Dean Herbert
c38cd50723
Fix editor not using beatmap combo colours initially on load
2020-09-23 13:16:50 +09:00
Dean Herbert
80fb8f074c
Merge branch 'master' into add-editor-keybindings
2020-09-23 12:32:04 +09:00
Dean Herbert
260ca31df0
Change default mute key to Ctrl+F4 for now
2020-09-23 12:31:50 +09:00
Dan Balasescu
fbaa6675c2
Merge branch 'master' into fix-hit-object-container-unbinding
2020-09-23 12:05:14 +09:00
Dan Balasescu
3d90bb5e38
Merge pull request #10203 from peppy/fix-fail-animation
...
Fix fail animation breaking on post-fail judgements
2020-09-23 11:57:49 +09:00
Dan Balasescu
6d58973452
Merge pull request #10208 from peppy/reduce-all-hitobject-enumerator-complexity
...
Reduce complexity of AllHitObjects enumerator when nested playfields are not present
2020-09-23 11:50:10 +09:00
Bartłomiej Dach
941ff81d8d
Merge branch 'master' into fix-hit-object-container-unbinding
2020-09-22 16:38:35 +02:00
Dean Herbert
e0a2321822
Reduce complexity of AllHitObjects enumerator when nested playfields are not present
2020-09-22 18:17:04 +09:00
Dean Herbert
0e01ac2d90
Merge branch 'master' into fix-new-samples-starting-while-gameplay-paused
2020-09-22 16:16:54 +09:00
Dean Herbert
3062fe4411
Add editor key bindings to switch between screens
2020-09-22 15:55:25 +09:00
Dean Herbert
3276b9ae9c
Fix fail animation breaking on post-fail judgements
2020-09-22 15:08:53 +09:00
Dean Herbert
552968f65f
Remove unnecessary using
2020-09-22 13:38:52 +09:00
Dean Herbert
7c40071b21
Revert changes to SkinnableTestScene but change load order
2020-09-22 13:35:35 +09:00
Salman Ahmed
bfe332909c
Remove "hide combo counter on break time" feature for being too complex
...
The combo counter will be hidden at most one second after the break has started anyways, so why not just remove this feature if the way of implementing it is complicated to be merged within the legacy counter implementation.
2020-09-21 14:32:14 +03:00
Dean Herbert
508278505f
Make local clock private
2020-09-21 19:40:57 +09:00
Dean Herbert
3f788da06d
Fix SPM changing incorrectly with playback rate changes
2020-09-21 19:39:54 +09:00
Dean Herbert
dd5b15c64f
Fix HitObjectContainer not correctly unbinding from startTime fast enough
2020-09-21 18:27:15 +09:00
Dean Herbert
1e09d8fd1a
Merge branch 'master' into catch-combo-counter
2020-09-21 17:53:00 +09:00
S Stewart
d2f498a268
remove unnec using
2020-09-19 15:13:52 -05:00
S Stewart
c49dcca1ff
spacing oops
2020-09-19 14:55:52 -05:00
S Stewart
e0cef6686d
Change collection deletion notif to be consistent
2020-09-19 14:54:14 -05:00
Salman Ahmed
735b6b0d6f
Remove a pointless portion of the inline comment
2020-09-19 05:54:40 +03:00
Salman Ahmed
6aa84424e4
Merge remote-tracking branch 'upstream/master' into fix-new-samples-starting-while-gameplay-paused
2020-09-19 05:53:04 +03:00
Dean Herbert
1fcf443314
Ensure BeatmapProcessor.PostProcess is run before firing HitObjectUpdated events
2020-09-18 19:33:03 +09:00
Joehu
393ee1c9f5
Fix hovered osu tab items not showing hover state when deselected
2020-09-17 23:09:09 -07:00
Joehu
2ad7e6ca88
Fix hovered channel tabs color when unselected
2020-09-17 19:10:58 -07:00
Joehu
83d23c9547
Use new icon in chat overlay
2020-09-17 14:56:08 -07:00
Dean Herbert
141fbbf5bb
Merge pull request #10180 from smoogipoo/beatmap-conversion-cancellation
...
Make beatmap conversion support cancellation tokens
2020-09-17 22:30:46 +09:00
smoogipoo
de5ef8a471
Rework to support obsoletion
2020-09-17 21:37:32 +09:00
smoogipoo
e71991a53c
Add default token
2020-09-17 18:37:48 +09:00
smoogipoo
c7d24203ce
Make beatmap conversion support cancellation tokens
2020-09-17 17:40:05 +09:00
smoogipoo
73a7b759cb
Add missing obsoletion notice
2020-09-17 17:04:44 +09:00
Dan Balasescu
0d889f8cc0
Merge pull request #10173 from Joehuu/fix-profile-section-tab-control-input
...
Fix profile section tab control not absorbing input from behind
2020-09-17 16:53:18 +09:00
Dean Herbert
3529a1bfea
Fix global bindings being lost when running tests under headless contexts
2020-09-17 13:01:14 +09:00
Dean Herbert
c7e4b192ae
Merge branch 'master' into better-skin-hashing
2020-09-17 12:30:14 +09:00
Joehu
9063c60b9c
Fix profile section tab control not absorbing input from behind
2020-09-16 12:00:27 -07:00
Joehu
c6386ea605
Remember leaderboard mods filter selection in song select
2020-09-15 21:53:35 -07:00
Salman Ahmed
35c7677d0a
Fix gameplay samples potentially start playing while player is paused
2020-09-16 01:59:07 +03:00
Dean Herbert
53f9381ad9
Merge branch 'master' into better-skin-hashing
2020-09-16 00:25:33 +09:00
Dean Herbert
3c70b3127c
Fix potential nullref in FilterControl during asynchronous load
2020-09-15 23:19:31 +09:00
Dan Balasescu
8f5115b4e8
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 19:32:52 +09:00
Dean Herbert
f7c9c80566
Force OsuGameTests to use a unique storage each run
2020-09-15 19:01:32 +09:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter
2020-09-15 17:20:31 +09:00
Dan Balasescu
fc15b4546d
Merge pull request #10140 from peppy/editor-clipboard
...
Editor clipboard support
2020-09-15 17:15:49 +09:00
Dean Herbert
d03bfec807
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 16:54:06 +09:00
Dean Herbert
7f2ce14f36
Merge pull request #9294 from smoogipoo/morth-taiko-changes
2020-09-15 16:11:17 +09:00
Dan Balasescu
16ae83c499
Merge branch 'master' into editor-clipboard
2020-09-15 16:05:43 +09:00
Dan Balasescu
6cbff98295
Merge branch 'master' into add-collections-to-beatmap-options
2020-09-15 15:23:33 +09:00
Dan Balasescu
3e1c517700
Merge pull request #10160 from peppy/ss-dispose-null-check
...
Add null check in SongSelect disposal for safety
2020-09-15 15:06:17 +09:00
Dean Herbert
914785ce17
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 14:49:10 +09:00
Dean Herbert
0446bc8610
Fix game.ini getting left over by PlayerTestScene subclasses
2020-09-15 14:43:24 +09:00
Dean Herbert
2c7492d717
Add null check in SongSelect disposal for safety
2020-09-15 14:34:58 +09:00
Dean Herbert
879979ef57
Move host lookup to inside lazy retrieval to handle edge cases
2020-09-15 14:25:31 +09:00
Dean Herbert
234152b2fe
Use host storage as LocalStorage for headless test runs
2020-09-15 14:17:40 +09:00
Joehu
43daabc982
Remove unused using and move dialog to BDL
2020-09-14 12:10:00 -07:00
Joehu
c833f5fcc4
Reorder buttons to match stable
2020-09-14 11:23:41 -07:00
Joehu
57610ddad5
Fix beatmap options absorbing input from toolbar ruleset selector
2020-09-14 11:22:16 -07:00
Joehu
c30174cea3
Add manage collections button to beatmap options
2020-09-14 11:21:23 -07:00
Joehu
1a8a7ae7f8
Remove hardcoded key param from AddButton
2020-09-14 11:19:18 -07:00
Joehu
368aca015a
Move override methods to bottom
2020-09-14 11:18:00 -07:00
Bartłomiej Dach
a377cccb4d
Unsubscribe from track changed event on disposal
2020-09-14 17:10:35 +02:00
Bartłomiej Dach
6ed4c7caef
Merge branch 'master' into flaky-song-select-tests-v2
2020-09-14 16:42:40 +02:00
Dean Herbert
be8877b0f4
Merge branch 'master' into better-skin-hashing
2020-09-14 23:32:17 +09:00
Dean Herbert
1884e0167b
Eagerly populate skin metadata to allow usage in hashing computation
2020-09-14 23:31:03 +09:00
Dean Herbert
91d37e0459
Fix typo in comment
2020-09-14 20:17:00 +09:00
Dean Herbert
2b48ae42be
Merge branch 'master' into better-skin-hashing
2020-09-14 20:16:33 +09:00
Dean Herbert
daf54c7eb9
Revert EditorBeatmap.Remove API
2020-09-14 17:55:41 +09:00
Dean Herbert
6b60888139
Merge branch 'fix-post-convert-json-serialize' into editor-clipboard
2020-09-14 17:38:53 +09:00
Dean Herbert
a8b405791a
Fix non-convert slider and spinner serialization
2020-09-14 17:32:32 +09:00
Dan Balasescu
2c4aa42023
Merge pull request #10149 from Joehuu/fix-mod-select-absorbing-input
...
Fix mod select overlay absorbing input from toolbar ruleset selector
2020-09-14 17:20:05 +09:00
Dan Balasescu
3118f635f6
Merge branch 'master' into editor-fix-multiple-selection
2020-09-14 16:45:30 +09:00
Dean Herbert
62c55165d4
Merge branch 'editor-fix-multiple-selection' into editor-clipboard
2020-09-14 15:47:20 +09:00
Dean Herbert
b7a06524fb
Update comment to make more sense
2020-09-14 15:47:10 +09:00
Dean Herbert
75e4f224e5
Add back accidentally removed remove
2020-09-14 15:47:04 +09:00
Dean Herbert
0ef4dfc192
Move more logic to base EditorTestScene
2020-09-14 15:27:08 +09:00
Dean Herbert
da02ee8828
Add ability to create a TestBeatmap with no HitObjects
2020-09-14 15:26:57 +09:00
Dean Herbert
692f2c8489
Simplify debounced update pathway
2020-09-14 14:58:00 +09:00
Joehu
4dacdb9994
Fix mod select overlay absorbing input from toolbar ruleset selector
2020-09-13 11:50:21 -07: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
0079d94676
Merge branch 'master' into editor-clipboard
2020-09-13 22:30:13 +09:00
Bartłomiej Dach
3db0e7cd75
Generalise LegacyRollingCounter
2020-09-12 22:40:32 +02:00
Bartłomiej Dach
f17b2f1359
Ensure track is looping in song select immediately
2020-09-12 20:43:17 +02:00
Dean Herbert
5e108e1d6a
Merge branch 'master' into nowplaying-collections-filter
2020-09-12 21:33:07 +09:00
Dean Herbert
1a9f0ac16a
Select new objects
2020-09-12 21:23:12 +09:00
Dean Herbert
3854caae9b
Remove secondary schedule logic
2020-09-12 21:23:12 +09:00
Dean Herbert
81f30cd264
Select blueprint if object is already selected at the point of adding
2020-09-12 21:23:11 +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
cb14d847de
Update framework
2020-09-11 22:40:12 +09:00
Dean Herbert
94d929d8cd
Remove unnecessary contains checks
2020-09-11 22:03:19 +09:00
Dan Balasescu
53fab11321
Merge pull request #10138 from peppy/editor-fix-masking
...
Fix editor hitobjects getting masked weirdly
2020-09-11 20:57:53 +09:00
Dean Herbert
08be45c9e7
Merge branch 'master' into editor-clipboard
2020-09-11 20:35:05 +09:00
Dean Herbert
97b995246a
Merge branch 'editor-fix-multiple-selection' into editor-clipboard
2020-09-11 20:34:58 +09:00
Dean Herbert
22e6df02b6
Fix editor selected hitobjects containing the selection up to five times
2020-09-11 20:27:07 +09:00
Dean Herbert
432c3e17eb
Fix toolbox becoming inoperable due to incorrect ordering
2020-09-11 20:23:34 +09:00
Dean Herbert
139a5acd1b
Fix editor hitobjects getting masked weirdly
...
Closes #10124
2020-09-11 20:16:50 +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
8e028dd88f
Fix incorrect ordering of ApplyDefaults for newly added objects
2020-09-11 19:54:11 +09:00
smoogipoo
b047fbb8ee
Use bindable value for search text
2020-09-11 17:46:07 +09:00
smoogipoo
6327f12fe4
Disable manage collections item in now playing overlay
2020-09-11 16:58:18 +09:00
smoogipoo
fcc8683629
Hook up now playing overlay to collections
2020-09-11 16:46:11 +09:00
Dean Herbert
ef77658311
Add coverage of case where skin.ini doesn't specify name/author
2020-09-11 16:29:14 +09:00
Dean Herbert
15b533f2a4
Hash skins based on name, not skin.ini contents
...
It is feasible that a user may be changing the contents of skin.ini
without changing the skin name / author. Such changes should not create
a new skin if already imported.
2020-09-11 16:20:54 +09:00
smoogipoo
a6a76de7a9
Re-expose sealed methods
2020-09-11 16:09:08 +09:00
smoogipoo
06c49070b1
Remove player collection settings
2020-09-11 16:04:09 +09:00
smoogipoo
4061480419
Rename menu item
2020-09-11 16:02:46 +09:00
smoogipoo
5b80a7db5f
Re-namespace collections dropdown
2020-09-11 16:01:01 +09:00
Dan Balasescu
54520faa7e
Merge pull request #10082 from EVAST9919/profile-sections-update
...
Update section headers in ProfileOverlay in line with web
2020-09-11 14:53:17 +09:00
Dean Herbert
033bd82953
Merge branch 'master' into fix-filtercontrol-order
2020-09-11 13:07:41 +09:00
Dan Balasescu
48db5739ed
Merge pull request #10126 from Joehuu/fix-playlist-item-no-drag-handle
...
Fix drag handles not showing on now playing playlist items
2020-09-11 12:31:57 +09:00
smoogipoo
22c5e9f64f
Rename missing parameter
2020-09-11 12:19:26 +09:00
smoogipoo
be5d143b5a
Reorder params
2020-09-11 12:17:12 +09:00
Dean Herbert
b594a2a507
Import collections on initial import-from-stable step
2020-09-11 11:16:00 +09:00
Bartłomiej Dach
a350802158
Fix wrong mono streak length handling in corner case
2020-09-10 20:50:26 +02:00
Joehu
370f22f975
Show drag handle by default on main class
2020-09-10 11:11:45 -07:00
Bartłomiej Dach
0fb0dc0fde
Merge branch 'master' into fix-filtercontrol-order
2020-09-10 20:07:31 +02:00
Andrei Zavatski
cfc6e2175d
Add missing header to MostPlayedBeatmapsContainer
2020-09-10 20:58:37 +03:00
Andrei Zavatski
913e3faf60
Move PaginatedContainerWithHeader logic to a base class
2020-09-10 20:48:06 +03:00
Joehu
6c9fcae69f
Fix drag handles not showing on now playing playlist items
2020-09-10 10:48:00 -07:00
Andrei Zavatski
e5f70d8eae
Simplify counter visibility changes in PaginatedContainerHeader
2020-09-10 20:31:00 +03:00
Andrei Zavatski
931e567c7e
Replace counter font size with an actual value
2020-09-10 20:25:35 +03:00
