Dean Herbert
7f5ea57bd4
Clean-up pass (best effort) on LegacyComboCounter
2020-10-14 19:16:34 +09:00
Dean Herbert
9bb8a43bce
Combine LegacyComboCounter and ComboCounter classes
2020-10-14 19:16:34 +09:00
Dean Herbert
fbbea48c8c
Add score text skinnability
2020-10-14 19:16:34 +09:00
Dean Herbert
2fce064e32
Add basic legacy combo counter and updating positioning logic
2020-10-14 19:16:34 +09:00
Dean Herbert
6a6718ebab
Allow bypassing origin/anchor setting of skinnable components
...
It makes little sense to set these when using RelativeSizeAxes.Both
2020-10-14 19:16:34 +09:00
Dean Herbert
899bac6ca5
Rename catch combo counter for clarity
2020-10-14 19:16:34 +09:00
Dean Herbert
f5623ee21e
Setup skinnable combo counter component with default implementation
2020-10-14 19:16:34 +09:00
Dean Herbert
60603d2918
Add skin components and interfaces
2020-10-14 19:16:34 +09:00
Dean Herbert
98acf1e31d
Make field read only
2020-10-14 19:16:25 +09:00
Dean Herbert
a7f8e26e35
Adjust bottom-right elements positions based on song progress display
2020-10-14 18:51:53 +09:00
Dean Herbert
0cf3e90904
Update SongProgress height based on its dynamic height during resize
2020-10-14 18:44:22 +09:00
Dean Herbert
ace9fbc8d3
Confine available area for HUD components to excluse the song progress area
2020-10-14 18:44:22 +09:00
Dean Herbert
30e1fce7a4
Reduce alloc overhead of DrawableCarouselBeatmapSet using new function-based ctor
2020-10-14 15:10:50 +09:00
Dean Herbert
07e6609e6d
Disable difficulty calculation for set-level difficulty icons
2020-10-14 14:16:22 +09:00
Dean Herbert
e662dc5342
Add missing licence headers
2020-10-13 20:57:26 +09:00
Dean Herbert
8057ea1097
Fix formatting issues
2020-10-13 20:50:36 +09:00
Dean Herbert
3d416f4d64
Clean up beatmapSet resolution in DrawableCarouselBeatmapSet
2020-10-13 19:31:29 +09:00
Dean Herbert
75b6a5e17e
Remove unnecessary hack (fixed via framework update)
2020-10-13 19:31:29 +09:00
Dean Herbert
5d11db7753
Locallise ChildItems to DrawableCarouselBeatmapSet for clarity
2020-10-13 19:31:29 +09:00
Dean Herbert
37daefc2b5
Remove outdated comment
2020-10-13 19:12:33 +09:00
Dean Herbert
8eca28e8bc
Add comment about off-screen loading
2020-10-13 19:10:35 +09:00
Dean Herbert
834b0186f4
Adjust fade duration to be slightly shorter
2020-10-13 18:50:10 +09:00
Dean Herbert
2346644c04
Switch DelayedLoadUnloadWrappers to DelayedLoadWrappers
...
Due to pooling usage, there is no time we need to unload. Switching to
DelayedLoadWrapper cleans up the code and reduces overhead
substantially.
2020-10-13 18:47:40 +09:00
Dean Herbert
a1801f8ae4
Unmark todo for now
2020-10-13 18:47:36 +09:00
Dean Herbert
40a0ab7aaa
Avoid allocating CarouselItems for bounds checks
2020-10-13 18:33:31 +09:00
Dean Herbert
4f4f222514
Remove unnecessary fade (already applied by base DrawableCarouselItem)
2020-10-13 18:28:28 +09:00
Dean Herbert
83358d487f
Remove logging
2020-10-13 18:18:22 +09:00
Dean Herbert
3d9ea852ec
Remove masking override (no longer needed as our size is now correct)
2020-10-13 18:14:23 +09:00
Dean Herbert
69650c16fc
Simplify vertical position calculations by including spacing in height definition
2020-10-13 18:13:36 +09:00
Dean Herbert
b1ddb08a4e
Fix right click context menus appearing in incorrect locations
2020-10-13 18:01:12 +09:00
Dean Herbert
d9a6a6b245
Split content out into own class
2020-10-13 18:01:12 +09:00
Dean Herbert
9b2ebb8f0f
Fix main content DelayedLoadUnloadWrapper not getting a valid size before load
2020-10-13 17:45:41 +09:00
Dean Herbert
f3b937e358
Fix masking issues with certain aspect ratio displays
2020-10-13 17:37:33 +09:00
Dean Herbert
fdd4d95cdc
Fix difficulties being at incorrect vertical positions after filter is applied
2020-10-13 17:37:33 +09:00
Dean Herbert
1f0aa974dd
Fix failing tests
2020-10-13 17:37:33 +09:00
Dean Herbert
b536f571fd
Move header height propagation to update for safety
2020-10-13 17:37:33 +09:00
Dean Herbert
ded09b78cb
Avoid usage of AutoSize for DrawableCarouselItems in general
2020-10-13 17:37:33 +09:00
Dean Herbert
cecdf14f53
Avoid reconstructing beatmap difficulties that were recently displayed
2020-10-13 17:37:33 +09:00
Dean Herbert
1da49073ab
Calculate content height automatically
2020-10-13 17:37:33 +09:00
Dean Herbert
c08b5e8d03
Align beatmap difficulties correctly
2020-10-13 17:37:33 +09:00
Dean Herbert
cfec4f4fc1
Extract header element from base DrawableCarouselItem class
2020-10-13 17:37:33 +09:00
Dean Herbert
2aad482545
Fix x offsets of difficulties not being updated
2020-10-13 17:37:33 +09:00
Dean Herbert
1b7e3397c6
Use expiry to avoid ToArray
2020-10-13 17:37:33 +09:00
Dean Herbert
075bf23714
Better track off-screen drawables (and return to pool less often)
2020-10-13 17:37:33 +09:00
Dean Herbert
29983afcef
Replace pool/cleanup logic with simplest form possible
...
This will temporarily break panels that go off-screen, as they will
disappear immediately
2020-10-13 17:37:33 +09:00
Dean Herbert
06e84c8eb3
Add comments and split out update steps into a more logical flow
2020-10-13 17:37:33 +09:00
Dean Herbert
20b54fb904
Move transform clean-up to pooling free call
2020-10-13 17:37:33 +09:00
Dean Herbert
f6aa448523
Store y positions inside items rather than in a separate array
2020-10-13 17:37:33 +09:00
Dean Herbert
b92c22ad42
Add logging
2020-10-13 17:37:33 +09:00
Dean Herbert
9814e9ba7f
Split classes out to reduce loc burder on DrawableCarouselBeatmapSet
2020-10-13 17:37:33 +09:00
Dean Herbert
975cd5a840
Add back beatmap difficulty appear/disappear movement
2020-10-13 17:37:33 +09:00
Dean Herbert
fd8654cff3
Add back difficulty panel spacing
2020-10-13 17:37:33 +09:00
Dean Herbert
ce67f65084
Fix single results not showing up
2020-10-13 17:37:33 +09:00
Dean Herbert
220c8ba2c4
Fix incorrect vertical offsets when difficulties are filtered away
2020-10-13 17:37:33 +09:00
Dean Herbert
82f9ca3de9
Bind to filter event changes in base drawable item
2020-10-13 17:37:33 +09:00
Dean Herbert
813ee19728
Use existing event flow for rendering beatmap difficulties
2020-10-13 17:37:33 +09:00
Dean Herbert
8847cedf29
Add initial pass of vertical transforms
2020-10-13 17:37:33 +09:00
Dean Herbert
15325f5f51
Base bounds checks on +1 (to avoid worrying about current item heights)
2020-10-13 17:37:33 +09:00
Dean Herbert
bb03c5d77c
Temporarily disable masking temporarily to fix panels disappearing at extents
2020-10-13 17:37:33 +09:00
Dean Herbert
524419d5e4
Fix filtered items being considered for height calculation
2020-10-13 17:37:33 +09:00
Dean Herbert
0a144a1388
Correctly free panels after use to avoid finalizer disposal of subtree
2020-10-13 17:37:33 +09:00
Dean Herbert
c5a6f4b453
Fix scroll to selected beatmap
2020-10-13 17:37:33 +09:00
Dean Herbert
5c29aa8cce
Fix multiple difficulties being expanded at once
2020-10-13 17:37:33 +09:00
Dean Herbert
5c2f134665
Add back left offset for selected set
2020-10-13 17:37:33 +09:00
Dean Herbert
3cfc0dc82d
Add safeties to beatmap panel loading code
2020-10-13 17:37:33 +09:00
Dean Herbert
954d43ef56
Debounce state application events
2020-10-13 17:37:33 +09:00
Dean Herbert
ca1f5dcada
Add back panel padding
2020-10-13 17:37:33 +09:00
Dean Herbert
0400b34349
Load more components asynchronously after pool resolution
2020-10-13 17:37:33 +09:00
Dean Herbert
f3b24b9bb5
Avoid performing eager selection constantly on adding ranges of new children
2020-10-13 17:37:33 +09:00
Dean Herbert
0a978c6131
Add basic pooling setup
2020-10-13 17:37:33 +09:00
Dean Herbert
f17d661c1a
Add basic range-based invalidation
2020-10-13 17:37:33 +09:00
Dean Herbert
3143224e5b
Refactor how drawable carousel items are constructed
2020-10-13 17:37:33 +09:00
Dean Herbert
9193f5b0ba
Expose panel height from non-drawable models
2020-10-13 17:37:33 +09:00
Dean Herbert
a393bbe8f7
Remove direct drawable storage from carousel models
2020-10-13 17:37:33 +09:00
Dean Herbert
b08e7ce1f5
Update BaseColour specification
2020-10-13 17:37:24 +09:00
Bartłomiej Dach
68b505ab86
Extract helper function for pp value handling
2020-10-12 22:14:45 +02:00
Dean Herbert
8431a5a23c
Merge pull request #10483 from Joehuu/add-extended-stats-keyboard-shortcut
2020-10-11 22:48:42 +09:00
Dean Herbert
a246991c50
Merge pull request #10472 from LeNitrous/expose-player-isbreaktime
...
Expose BreakTracker.IsBreakTime in Player
2020-10-11 22:36:24 +09:00
Dean Herbert
de6fe34361
Bind to local bindable and combine dual bindings
2020-10-11 21:51:48 +09:00
Dean Herbert
5fcdee6fd8
Remove cast and expose as IBindable
2020-10-11 21:46:55 +09:00
Joehu
8faa86b048
Add ability to toggle extended statistics using space or enter
2020-10-10 18:32:22 -07:00
unknown
6a52c98a42
make IsBreakTime its own bindable and bind it to BreakTracker on load
2020-10-11 06:15:20 +08:00
Lucas A
e845cc92b8
Round pp values to nearest integer.
2020-10-10 19:58:06 +02:00
Lucas A
de522d53ea
Make CalculatePerformanceAsync() nullable.
2020-10-10 19:16:21 +02:00
unknown
7bbdd6ab25
expose break time bindable
2020-10-10 21:07:17 +08:00
Dean Herbert
73c238fae3
Add the ability to search for local beatmaps via online IDs
...
Closes #10470 .
2020-10-10 21:34:11 +09:00
Dean Herbert
b0f8a7794a
Make SelectionHandler require EditorBeatmap presence
2020-10-09 21:44:10 +09:00
Dean Herbert
681e88af40
Merge branch 'master' into editor-fix-button-states-after-paste
2020-10-09 20:51:09 +09:00
Dan Balasescu
ecfb7e94c5
Merge branch 'master' into fix-editor-batch-handling
2020-10-09 20:06:06 +09:00
Dan Balasescu
07f19342d1
Merge pull request #10428 from peppy/editor-reset-newcombo-on-placement
...
Reset new combo button state after successful placement
2020-10-09 19:48:47 +09:00
Dan Balasescu
bcc096ee49
Merge pull request #10446 from peppy/fix-timeline-tick-bar-lines
...
Fix bar lines ("down beat" as people call it) showing up too often in timeline
2020-10-09 19:24:29 +09:00
Dan Balasescu
62690e4873
Merge pull request #10432 from peppy/editor-reverse-pattern
...
Add "reverse pattern" support to editor selection handler
2020-10-09 19:19:24 +09:00
Dean Herbert
3838f405dd
Fix missed usages
2020-10-09 18:50:05 +09:00
Dean Herbert
edaf6db5c6
Reference EditorBeatmap directly for selected objects
2020-10-09 18:44:23 +09:00
Dean Herbert
21c6242f90
Fix bar lines ("down beat" as people call it) showing up too often in timeline
2020-10-09 18:35:44 +09:00
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
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
8be19fd820
Increase height of contracted score panel to fit mods again
2020-10-09 13:26:09 +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
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
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
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
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
Lucas A
a425cf4a31
Fix broken class reference.
2020-10-07 13:29:10 +02:00
Lucas A
7f5cf04b2b
Fix merge conflicts.
2020-10-07 13:28:49 +02: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
Dean Herbert
31d347be5c
Make extended score panel taller to better fit all information
2020-10-07 16:50:00 +09:00
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
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
Shane Woolcock
8b8eb00bd7
Permit nulls rather than casting to OsuGame
2020-10-07 16:16:58 +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
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
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
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
Shane Woolcock
478f2dec96
Maintain the current gameplay state in OsuGame
2020-10-06 22:39:35 +10:30
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
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
Shane Woolcock
782fc1d60f
Use OsuGame.OverlayActivationMode rather than per-Player
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
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
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
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
Lucas A
35f7de2084
Apply review suggestions.
2020-09-29 18:08:21 +02: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
Lucas A
6efc4c4250
Cache performance calculations to prevent recomputations.
2020-09-28 19:04:39 +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
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
Lucas A
ddede85704
Split performance calculation to its own class.
2020-09-27 12:44:29 +02:00
Lucas A
3cb9103fe0
Inherit PerformanceStatistic from CounterStatistic
2020-09-27 09:37:57 +02:00
Lucas A
4d94bf3163
Rename CalculateScorePerformance -> CalculatePerformance
2020-09-25 19:16:33 +02:00
Lucas A
77a9d92f42
Add dynamic pp calculation to score panels for local scores
2020-09-25 19:15:40 +02: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
Dan Balasescu
e828cf1607
Merge branch 'master' into editor-load-audio
2020-09-25 14:49:54 +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
26ba7d3100
Remove unused method (was moved to a more local location)
2020-09-25 13:20:19 +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
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
44a6637c36
Use SingleOrDefault
2020-09-25 12:20:37 +09:00
Dean Herbert
b9196718b7
Merge branch 'master' into editor-object-object-snapping
2020-09-25 12:15:10 +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
158d307126
Avoid destroying editor screens when changing between modes
2020-09-24 17:03:54 +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
