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
4ba8d823d3
Merge branch 'master' into fix-quick-retry-music-playback
2020-10-07 20:57:10 +02: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
