Dan Balasescu
a6d19cd2d6
Merge pull request #10431 from peppy/fix-distribution-graph-rounding
...
Fix incorrect timing distribution display due to lack of rounding
2020-10-09 18:12:29 +09:00
Dan Balasescu
6572ce5f36
Merge pull request #10441 from peppy/editor-selection-blueprint-performance
...
Improve performance of slider blueprints
2020-10-09 18:01:25 +09:00
Dan Balasescu
a1226ccaa2
Merge pull request #10440 from peppy/fix-editor-song-after-exit
...
Fix editor playing deleted beatmap's track on exit-without-save
2020-10-09 17:58:31 +09:00
Dan Balasescu
4881a13f4b
Merge pull request #10443 from peppy/editor-timeline-tick-display-performance
...
Improve TimelineTickDisplay performance
2020-10-09 17:53:12 +09:00
Dean Herbert
5d888f687a
Account for the width of points so they don't suddenly appear at timeline edges
2020-10-09 16:49:51 +09:00
Dean Herbert
ceb1494c33
Only run regeneration when passing a new min/max tick boundary
2020-10-09 16:47:29 +09:00
Dean Herbert
017a8ce496
Only recalculate when display actually changes
2020-10-09 15:57:31 +09:00
Dean Herbert
9baf704942
Add local pooling to TimelineTickDisplay
2020-10-09 15:48:24 +09:00
Dean Herbert
beec0e4193
Hide children of SelectionBlueprint when not selected
2020-10-09 14:03:13 +09:00
Dean Herbert
8be19fd820
Increase height of contracted score panel to fit mods again
2020-10-09 13:26:09 +09:00
Dean Herbert
389ffe7da5
Hide bonus result types from score table for the time being
2020-10-09 13:23:18 +09:00
Dean Herbert
07558b5bc0
Merge branch 'master' into ruleset-result-types
2020-10-09 13:17:05 +09:00
Dean Herbert
68039cff40
Set beatmap to sane default on exiting editor
2020-10-09 13:12:48 +09:00
Dean Herbert
c86b37f60d
Add check to ensure MusicController doesn't play a delete pending beatmap's track
2020-10-09 13:11:24 +09:00
Dean Herbert
6649cb2204
Fix incorrect first object logic
2020-10-09 06:41:53 +09:00
Dean Herbert
825e10ec8c
Add reverse handler button to selection box
2020-10-09 06:32:23 +09:00
Dean Herbert
eacc7dca9a
Fix SliderPath not handling Clear correctly
2020-10-09 06:31:59 +09:00
Dean Herbert
85b33fffd0
Fix incorrect comments
2020-10-09 05:14:44 +09:00
Dean Herbert
ff5a1937f5
Fix test logic and stabilise rounding direction
2020-10-09 05:04:03 +09:00
Dean Herbert
a5b2c4195e
Fix incorrect timing distribution display due to lack of rounding
2020-10-09 04:41:45 +09:00
Bartłomiej Dach
c867fb4985
Merge branch 'master' into update-check-improvements
2020-10-08 21:32:26 +02:00
Dean Herbert
5966205037
Fix ternary button states not updating correctly after a paste operation
2020-10-09 04:31:45 +09:00
Dean Herbert
e7eda19b07
Reset new combo button state after successful placement
2020-10-09 03:31:01 +09:00
Dean Herbert
2d0275ba95
Fix first hitobject in osu! hidden mod not getting correct fade applied
2020-10-09 03:07:01 +09:00
Dean Herbert
8dddd8aff5
Merge pull request #9883 from swoolcock/confine-during-gameplay
...
Add "During Gameplay" option for mouse confining
2020-10-08 20:25:27 +09:00
Dean Herbert
4ccd751604
Further simplify non-transactional change logic
2020-10-08 18:42:53 +09:00
Dean Herbert
3114174e09
Add missing non-transactional SaveState calls
2020-10-08 18:41:03 +09:00
Dean Herbert
dbdb25ccf7
Move reset logic to OsuGame
2020-10-08 18:29:19 +09:00
Dean Herbert
43a575484a
Remove pointless comments
2020-10-08 18:29:09 +09:00
Dean Herbert
0967db768f
Add xmldoc covering usage restrictions
2020-10-08 18:28:56 +09:00
Dean Herbert
afed832b19
Tidy up EditorBeatmap slightly
2020-10-08 18:06:49 +09:00
Dean Herbert
1027b608ff
Copy list content before firing events to avoid pollution
2020-10-08 18:04:07 +09:00
Dean Herbert
38babf3de5
Update usages of ChangeHandler to EditorBeatmap where relevant
2020-10-08 18:04:07 +09:00
Dean Herbert
b2d93f799f
Hook ChangeHandler to transactional events rather than individual ones
2020-10-08 18:04:07 +09:00
Dean Herbert
0781fbd443
Make EditorBeatmap implement TransactionalCommitComponent
2020-10-08 18:04:07 +09:00
Dean Herbert
a9bca671d0
Make component and add hooking events
2020-10-08 18:04:07 +09:00
Dean Herbert
ce04daf053
Split transaction handling code out into base class
2020-10-08 18:04:07 +09:00
Dean Herbert
ef092de9ba
Add missing UpdateHitObject calls and move local to usages (not via bindables)
2020-10-08 18:04:07 +09:00
Bartłomiej Dach
ac44f6f679
Ensure control point group exists after move
...
If the control point group moved was empty, it would not be created due
to a lack of ControlPointInfo.Add() calls.
2020-10-07 23:10:28 +02:00
Bartłomiej Dach
b1029a124c
Move event subscription to LoadComplete
...
Prevents attempting to read from the `colours` field before it is
actually injected.
2020-10-07 22:57:20 +02:00
Bartłomiej Dach
7109c3b6cd
Rename variable as suggested
2020-10-07 21:06:24 +02:00
Bartłomiej Dach
4ba8d823d3
Merge branch 'master' into fix-quick-retry-music-playback
2020-10-07 20:57:10 +02:00
Endrik Tombak
2b6e4e575e
Award max combo portion score if max achievable is 0
2020-10-07 17:04:55 +03:00
Endrik Tombak
74af7cc503
Rework ScoreProcessor
2020-10-07 17:00:00 +03:00
Dean Herbert
1989141968
Merge branch 'master' into tourney-asset-refactor
2020-10-07 21:34:07 +09:00
Dean Herbert
1566882dc4
Merge pull request #10338 from Game4all/perf-calculator-remove-working-beatmap
...
Remove WorkingBeatmap from PerformanceCalculator
2020-10-07 20:04:24 +09:00
Dan Balasescu
6636b64cbd
Merge pull request #10407 from peppy/fix-sample-disposed-on-skin-change
...
Don't force playback of (non-looping) DrawableHitObject samples after skin change
2020-10-07 19:34:53 +09:00
Dean Herbert
94a6e28565
Add back second removed condition
2020-10-07 18:40:09 +09:00
Dean Herbert
3c3c1ce885
Don't force playback of (non-looping) DrawableHitObject samples after skin change
2020-10-07 18:18:01 +09:00
Dean Herbert
04fa0bff9d
Add CanBeNull spec and xmldoc
2020-10-07 17:46:57 +09:00
Dean Herbert
f1a3b6d0ba
Merge branch 'master' into perf-calculator-remove-working-beatmap
2020-10-07 17:43:17 +09:00
Dean Herbert
0f6eb9d4cb
Ensure music playback is stopped when retrying by any means
2020-10-07 17:40:54 +09:00
Dean Herbert
5171c18a4b
Merge branch 'master' into ruleset-result-types
2020-10-07 17:04:02 +09:00
Dean Herbert
f77ad8cf39
Remove unused using
2020-10-07 17:03:34 +09:00
Dan Balasescu
54ca544855
Merge pull request #10400 from peppy/fix-first-hitobject-must-be-combo
...
Ensure first hitobject is always a new combo
2020-10-07 17:01:31 +09:00
Dean Herbert
31d347be5c
Make extended score panel taller to better fit all information
2020-10-07 16:50:00 +09:00
Shane Woolcock
f88ba1734b
Remove ConfineMouseTracker field
2020-10-07 18:11:47 +10:30
Dan Balasescu
f206ea96ce
Merge pull request #10391 from peppy/editor-setup-screen-difficulty-adjust
...
Add difficulty adjustment settings to editor setup screen
2020-10-07 16:33:10 +09:00
Dean Herbert
67398b5d95
Move timestamp text out of flow and attach to bottom edge
2020-10-07 16:30:14 +09:00
Shane Woolcock
2e0a9f53c1
Add test coverage
2020-10-07 17:52:39 +10:30
Dan Balasescu
fbb10f6774
Merge branch 'master' into fix-first-hitobject-must-be-combo
2020-10-07 16:21:00 +09:00
Dean Herbert
6ac70945f2
Show bonus judgements on expanded panel
2020-10-07 16:17:28 +09:00
Dean Herbert
c0bc6a75b3
Show auxiliary judgements on next line
2020-10-07 16:17:17 +09:00
Dean Herbert
e281d724b8
Consume display name logic
2020-10-07 15:43:52 +09:00
Dean Herbert
3363c3399e
Allow rulesets to specify valid HitResult types (and display names for them)
2020-10-07 15:34:23 +09:00
Dean Herbert
d6d0bd90a3
Extract tuple into class
2020-10-07 15:34:03 +09:00
Dan Balasescu
338b4c56ce
Merge pull request #10399 from peppy/editor-beatmap-batch-change-support
...
Add editor beatmap batch change support
2020-10-07 14:57:51 +09:00
Shane Woolcock
8b8eb00bd7
Permit nulls rather than casting to OsuGame
2020-10-07 16:16:58 +10:30
Shane Woolcock
d1ec380692
Don't cache ConfineMouseTracker
2020-10-07 16:15:32 +10:30
Shane Woolcock
485bd962c7
Also reset LocalUserPlaying in OnSuspending
2020-10-07 16:15:17 +10:30
Shane Woolcock
7fff762dfc
Rename IsGameplay
2020-10-07 16:14:49 +10:30
Shane Woolcock
c8c5998af4
Bail if FrameworkSetting.ConfineMouseMode is unavailable
2020-10-07 16:02:35 +10:30
Dean Herbert
a6d1484ad5
Add arbirary precision specification for now
2020-10-07 14:26:01 +09:00
Dan Balasescu
2ef5a34ace
Merge branch 'master' into editor-beatmap-batch-change-support
2020-10-07 14:08:49 +09:00
Dean Herbert
a8151d5c63
Fix HitWindows getting serialized alongside HitObjects
...
These were being serialized as the base type. On deserialization, due to
the HitWindow of objects being non-null, they would not get correctly
initialised by the CreateHitWindows() virtual method.
- Closes #10403
2020-10-07 13:45:42 +09:00
Dean Herbert
c1a8fe01ef
Fix postprocess order in batch events
2020-10-07 11:09:45 +09:00
Shane Woolcock
8847b88e65
Fix unit tests trying to resolve OsuGame
2020-10-07 11:44:41 +10:30
Shane Woolcock
ec12a21088
Merge branch 'master' into confine-during-gameplay
...
# Conflicts:
# osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
2020-10-07 11:07:00 +10:30
Lucas A
f5a6beb4e5
Remove obsoletion notice.
2020-10-06 19:01:03 +02:00
Dean Herbert
afe3d3989a
Force first hitobject to be a NewCombo in BeatmapProcessor preprocessing step
2020-10-06 22:10:13 +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
14c734c244
Add a very simple method of applying batch changes to EditorBeatmap
2020-10-06 22:10:07 +09:00
Dean Herbert
b2dad67ade
Fix unresolvable dependency in settings test scene
2020-10-06 21:28:59 +09:00
Shane Woolcock
478f2dec96
Maintain the current gameplay state in OsuGame
2020-10-06 22:39:35 +10:30
Dean Herbert
e8b34ba4ac
Fix incorrectly committed testing change
2020-10-06 20:57:39 +09:00
Dan Balasescu
aae4a74d14
Merge branch 'master' into editor-setup-screen-difficulty-adjust
2020-10-06 20:11:44 +09:00
Dan Balasescu
50872e3839
Merge pull request #10390 from peppy/editor-setup-sections-container
...
Split editor setup screen up into sections
2020-10-06 20:07:56 +09:00
Dan Balasescu
7d4b495197
Merge pull request #10395 from peppy/editor-timeline-show-repeats
...
Add repeats display to timeline blueprints
2020-10-06 19:53:50 +09:00
Dan Balasescu
300423579e
Merge pull request #10394 from peppy/add-back-obsoleted-bindable-prop
...
Add obsoleted Bindable property back to SettingsItem for compatibility
2020-10-06 19:43:24 +09:00
Dean Herbert
461be02e6f
Update with underlying changes
2020-10-06 19:34:21 +09:00
Dean Herbert
87d4e86cad
Merge branch 'editor-setup-sections-container' into editor-setup-screen-difficulty-adjust
2020-10-06 19:30:32 +09:00
Dan Balasescu
77ccbb087c
Merge pull request #10393 from peppy/fix-editor-backwards-seek
...
Increase backwards seek magnitude when the track is running
2020-10-06 19:28:28 +09:00
Dean Herbert
06a51297a3
Use content instead of exposing the flow container
2020-10-06 19:26:57 +09:00
Dean Herbert
a2796d2c01
Add repeats display to timeline blueprints
2020-10-06 19:22:35 +09:00
Dan Balasescu
fa65e14455
Merge pull request #10392 from peppy/fix-editor-seek-modifier
...
Seek at 4x normal speed when holding shift (not 2x)
2020-10-06 19:19:41 +09:00
Dean Herbert
e64cee10b8
Add obsoleted Bindable property back to SettingsItem for compatibility
2020-10-06 19:07:31 +09:00
Shane Woolcock
782fc1d60f
Use OsuGame.OverlayActivationMode rather than per-Player
2020-10-06 20:27:35 +10:30
Shane Woolcock
1877312a91
Rename DuringGameplay
2020-10-06 20:27:35 +10:30
Dan Balasescu
064d081138
Merge branch 'master' into editor-setup-sections-container
2020-10-06 18:36:11 +09:00
Dan Balasescu
4036412387
Merge branch 'master' into labelled-slider-bar-2020
2020-10-06 18:29:20 +09:00
Dan Balasescu
e2d081e3cc
Merge pull request #10388 from peppy/editor-setup-placeholder-text
...
Add placeholder text/colour when no beatmap background is specified yet
2020-10-06 18:29:01 +09:00
Dean Herbert
d5782c95bd
Merge branch 'master' into confine-during-gameplay
2020-10-06 18:05:15 +09:00
Dean Herbert
b1a64f89d7
Increase backwards seek magnitude when the track is running
...
This matches osu-stable. When the track is running, seeking backwards
(against the flow) is harder than seeking forwards. Adding a mutliplier
makes it feel much better.
Note that this is additive not multiplicative because for larger seeks
the (where `amount` > 1) we don't want to jump an insanely huge amount -
just offset the seek slightly to account for playing audio.
2020-10-06 17:53:12 +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
7e8ab1cb95
Add description text
2020-10-06 17:36:18 +09:00
Dean Herbert
7a20a34aff
Add support to EditorBeatmap to update all hitobjects
2020-10-06 17:36:18 +09:00
Dean Herbert
6d7f12ad4b
Add basic difficulty setting sliders
2020-10-06 17:33:50 +09:00
Dean Herbert
13b67b93a5
Add difficulty section
2020-10-06 17:33:50 +09:00
Dean Herbert
e1a6f47d90
Add the most basic implementation of LabelledSliderBar feasible
2020-10-06 17:33:50 +09:00
Dean Herbert
505dd37a75
Make SettingsItem conform to IHasCurrentValue
2020-10-06 17:33:50 +09:00
Dean Herbert
98fe5f78ee
Split setup screen up into sections (and use a SectionContainer)
2020-10-06 17:29:08 +09:00
Dean Herbert
87bf3bdc16
Add the most basic implementation of LabelledSliderBar feasible
2020-10-06 17:26:06 +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
Dan Balasescu
461fa22e74
Merge pull request #10381 from peppy/ios-update-notifications
...
Add update notifications for iOS builds
2020-10-06 14:36:49 +09:00
Dean Herbert
5e10ac418b
Add update notifications for iOS builds
2020-10-06 13:19:52 +09:00
Dean Herbert
22b0105d62
Show a notification if checking for updates via button and there are none available
2020-10-06 13:00:02 +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
Dan Balasescu
12c84df208
Merge pull request #10371 from peppy/fix-gameplay-seek-sample-pausing
...
Fix seeking in replays not correctly pausing samples
2020-10-05 17:13:43 +09:00
Dan Balasescu
0c93de858e
Merge pull request #10373 from peppy/fix-hitobject-samples-cut-off
...
Don't stop non-looping samples immediately when pausing
2020-10-05 17:13:11 +09:00
Dean Herbert
c622adde7a
Rename method back and add xmldoc
2020-10-05 16:24:02 +09:00
Dean Herbert
d43ea68709
Merge branch 'master' into fix-gameplay-seek-sample-pausing
2020-10-05 16:21:28 +09:00
Dean Herbert
0605bb9b8d
Fix incorrect parent state transfer
2020-10-05 16:20:29 +09:00
Dan Balasescu
d3e1da5922
Merge branch 'master' into editor-timing-screen-change-handling
2020-10-05 15:40:43 +09:00
Dean Herbert
9f43dedf59
Fix missing line
2020-10-05 15:12:34 +09:00
Dean Herbert
758088672c
Don't stop non-looping samples immediately when pausing
2020-10-05 15:07:46 +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
ae8bf8cdd4
Fix StabilityGameClock not being updated
2020-10-05 14:27:51 +09:00
Dean Herbert
e4710f82ec
Fix sample disabled status not being updated correctly from seek state
2020-10-05 14:27:51 +09:00
Dean Herbert
af7d10afe0
Fix FrameStabilityContainer not re-caching its GameplayClock correctly
2020-10-05 14:27:51 +09:00
Dean Herbert
e41085dbb5
Merge pull request #10349 from bdach/health-adjustments
2020-10-05 11:02:13 +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
e56b2ad06b
Merge pull request #10365 from peppy/update-framework
...
Update framework
2020-10-05 00:21:01 +09:00
Dean Herbert
9ca0e48acc
Change exit logic to be more test-friendly
2020-10-04 23:57:28 +09:00
Dean Herbert
1b02c814d6
Update framework
2020-10-04 23:47:47 +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
5dea37792c
Merge branch 'master' into health-adjustments
2020-10-04 21:38:40 +09: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
Lucas A
d7747ebb2d
Remove unused WorkingBeatmap argument.
2020-10-03 16:51:22 +02:00
Dean Herbert
a864f2906f
Merge branch 'master' into health-adjustments
2020-10-03 22:50:19 +09: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
601675db07
Adjust health increase values to match old ones better
2020-10-03 12:16:22 +02:00
Bartłomiej Dach
309714081f
Make new health increase values mania-specific
2020-10-03 12:16:22 +02:00
Bartłomiej Dach
2ddfd79923
Replace object pattern match with simple conditional
2020-10-03 08:09:10 +02: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
Lucas A
0163688a17
Remove IBeatmap from PerformanceCalculator.
2020-10-02 19:24:30 +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
Dan Balasescu
b14b16071c
Merge branch 'master' into editor-timing-screen-change-handling
2020-10-02 18:36:06 +09:00
Dan Balasescu
7dc0b4d97e
Merge pull request #10327 from peppy/osu-slider-stable-triangle-seed
...
Avoid rapid triangle repositioning during editor slider placement
2020-10-02 18:23:19 +09:00
Dean Herbert
575046e5fd
Don't update reply on add/remove (will be automatically handled by change handler events)
2020-10-02 18:21:13 +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
faeb9910e5
Revert "Exit import process after first handler is run"
...
This reverts commit 4139301afa
2020-10-02 17:06:55 +09:00
Dean Herbert
2a02f8f3f3
Add support for background changing
2020-10-02 16:52:45 +09:00
Dean Herbert
4139301afa
Exit import process after first handler is run
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
b7c276093d
Add fallback case when EditorChangeHandler is not present (for tests)
2020-10-02 16:21:51 +09:00
Dean Herbert
50eca202f4
User IEnumerable for HandledExtensions
2020-10-02 16:17:10 +09:00
Dean Herbert
f3c8cd91f4
Remove unused method
2020-10-02 16:14:27 +09:00
Dean Herbert
fc65cb4375
Ensure precedence is given to newer registered handlers
2020-10-02 16:14:21 +09:00
Dean Herbert
e49ec092c9
Expose ability to register a component as an import handler
2020-10-02 16:08:11 +09:00
Dean Herbert
dde7f706aa
Avoid rapid triangle repositioning during editor slider placement
2020-10-02 15:51:14 +09:00
Dean Herbert
501e02db09
Only regenerate autoplay on editor state change
2020-10-02 15:44:37 +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
f501c88b46
Fix individual control points not being removed from group when group is removed
2020-10-02 15:28:21 +09:00
Dean Herbert
3069428efe
Merge pull request #10316 from smoogipoo/fix-spinner-flicker
...
Fix default spinner flashing yellow glow before completion
2020-10-01 22:29:48 +09:00
Dean Herbert
89beea6658
Merge pull request #10317 from smoogipoo/protect-multiple-applyresult
...
Safeguard againts multiple ApplyResult() invocations
2020-10-01 22:22:26 +09:00
smoogipoo
ab33434a8a
Reword xmldocs to better describe nested events
2020-10-01 21:54:43 +09:00
smoogipoo
042c39ae1b
Remove redundant string interpolation
2020-10-01 21:48:45 +09:00
smoogipoo
40c153e705
Use component instead of drawable
2020-10-01 21:39:40 +09:00
smoogipoo
d7f9b8045c
Safeguard againts multiple ApplyResult() invocations
2020-10-01 21:33:54 +09:00
Dan Balasescu
c93d1631d4
Merge pull request #10257 from hbnrmx/legacy-SpinnerNoBlink
...
Add support for SpinnerNoBlink to LegacyOldStyleSpinner
2020-10-01 21:25:48 +09:00
Dean Herbert
94996f2cc0
Merge branch 'master' into osu-selection-scaling
2020-10-01 21:09:52 +09:00
smoogipoo
62b55c4c9c
Use static method, add xmldoc + link to wiki
2020-10-01 20:50:47 +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
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
