Dan Balasescu
db25e9e9c8
Merge branch 'master' into combo-colour-brightness-limit
2022-11-11 15:31:28 +09:00
Dan Balasescu
94772a9cda
Merge pull request #21147 from peppy/fix-timeline-editor-crash
...
Fix editor hard crash when beatmap file specified out-of-range timeline zoom value
2022-11-10 22:59:55 +09:00
Dan Balasescu
606d42c679
Merge pull request #21184 from peppy/skinnable-things-cleanup
...
Skinnable class naming pass
2022-11-10 12:52:08 +09:00
Dan Balasescu
051f7f4c68
Merge pull request #21173 from peppy/toggle-hit-markers
...
Add the ability to toggle off hit marker displays in the editor
2022-11-10 12:23:53 +09:00
Dean Herbert
3547c04002
Merge branch 'master' into skinnable-things-cleanup
2022-11-10 12:09:32 +09:00
Piggey
0011f4e7be
fix comment lol
2022-11-09 19:59:04 +01:00
Piggey
4fbc240aa1
Merge remote-tracking branch 'origin/gameplay-leaderboard-fix' into gameplay-leaderboard-fix
2022-11-09 19:53:56 +01:00
Piggey
ab53fb17d3
change displayed text from #? to -
2022-11-09 19:53:36 +01:00
Dean Herbert
1aa0e40f2f
Add "Component" prefix to lookup naming
2022-11-09 17:46:43 +09:00
Dean Herbert
e75c3b3f94
Rename SkinnableTarget to GlobalSkinLookup
2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b
Rename ISkinComponent to ISkinLookup
2022-11-09 17:46:43 +09:00
Dean Herbert
4457648b1c
Fix editor playing too many sounds when user performs a manual seek during playback
2022-11-09 17:42:33 +09:00
Dawid Sośnia
9549e55ef8
Merge branch 'ppy:master' into gameplay-leaderboard-fix
2022-11-08 20:04:13 +01:00
Piggey
d48c56818f
change positionText to display "#?" if tracked score is being 51st on the leaderboard
2022-11-08 20:02:21 +01:00
Dean Herbert
4448fcb3c8
Override combo colour brightness normalisation setting only in editor
2022-11-08 18:29:10 +09:00
Dean Herbert
ada039151b
Add the ability to toggle off hit marker displays in the editor
2022-11-08 18:07:06 +09:00
Dean Herbert
9650ae1329
Limit editor background dim to 75% maximum
2022-11-08 17:20:37 +09:00
Dean Herbert
349d262c18
Remove commented unbind
2022-11-08 17:19:48 +09:00
Dean Herbert
b166e477c2
Merge branch 'master' into editor-background
2022-11-08 17:18:34 +09:00
Salman Ahmed
1465d043f4
Merge branch 'master' into song-select-transition-improvement
2022-11-08 03:36:19 +03:00
Dean Herbert
f6d93fcd5a
Fix editor hard crash when beatmap file specified out-of-range timeline zoom value
2022-11-07 12:54:02 +09:00
Dean Herbert
391840404d
Play exiting transition in both directions
2022-11-07 11:59:43 +09:00
maromalo
8eef2ba8de
quality shenanigans
2022-11-06 20:12:26 -03:00
maromalo
b7ef9b176d
Make score type consistent
2022-11-06 19:59:27 -03:00
Bartłomiej Dach
84179fb087
Merge branch 'master' into combo-colour-brightness-limit
2022-11-05 16:48:56 +01:00
Dean Herbert
4f14ae4e34
Adjust transition effect for main menu backgrounds
2022-11-04 17:45:14 +09:00
Dean Herbert
2b934e0bea
Increase delay for changing background on returning to main menu
2022-11-04 17:45:13 +09:00
Dean Herbert
c40c70509e
Improve song select transition to gameplay
2022-11-04 15:24:37 +09:00
Dean Herbert
486515ed90
Merge pull request #20758 from frenzibyte/maintain-common-mod-selection
...
Maintain selection of common mods when switching rulesets
2022-11-03 20:08:32 +09:00
Dean Herbert
e336d486a6
Merge pull request #21093 from peppy/auto-skip-multiple-times
...
Fix automated skip not skipping more than once when required
2022-11-03 15:46:56 +09:00
Dean Herbert
20dd405c2b
Merge branch 'master' into maintain-common-mod-selection
2022-11-03 15:32:40 +09:00
Dan Balasescu
fc191807c6
Fix velocity test failing with no audio device
2022-11-03 13:59:22 +09:00
Dean Herbert
4154be6cda
Adjust auto-skip to skip multiple times if necessary
2022-11-03 13:52:29 +09:00
Dean Herbert
aef3c7918c
Add total skip count to SkipOverlay
2022-11-03 13:52:24 +09:00
Dean Herbert
3ec9686e58
Fix test failures and rename configuration value to match better
2022-11-02 18:15:18 +09:00
Dean Herbert
0e502de8b4
Rename field to match usage
2022-11-02 18:04:42 +09:00
Dean Herbert
c3eb0c6330
Merge branch 'master' into editor-background
2022-11-02 17:43:38 +09:00
cdwcgt
9884618290
rename editorDim to editorBackgroundDim
2022-11-02 15:12:15 +09:00
cdwcgt
d6b8439121
add xmldoc for DimAmount
2022-11-02 15:11:49 +09:00
Dean Herbert
37300ba9e2
Standardise "Visual Settings" components to fix mismatched paddings and labels
2022-11-02 14:01:57 +09:00
Dean Herbert
50b6fe4acb
Localise new label
2022-11-02 14:01:03 +09:00
Dean Herbert
61fc3c8cc0
Add setting to visual settings toolbox
2022-11-02 13:58:34 +09:00
Dean Herbert
d8aa06ea92
Standardise "Visual Settings" components to fix mismatched paddings and labels
2022-11-02 13:55:56 +09:00
Dean Herbert
2a88409dfe
Fix time snap of sliders not matching when SV is not 1.0x
...
This regressed with https://github.com/ppy/osu/pull/20850 because the
function was used in other places which expect it to factor slider
velocity into the equation.
Rather than reverting, I've added a new argument, as based on the method
naming alone it was hard to discern whether SV should actually be
considered.
The reason for the change in #20850 was to avoid the SV coming in from a
reference object which may not have a correct SV in the first place. In
such cases, passing `false` to the function will give the expected
behaviour.
2022-11-01 15:12:58 +09:00
Dean Herbert
9ea2bd84bd
Merge pull request #21018 from andy840119/reuse-the-function-in-timeline-class
...
Reuse function in the timeline class
2022-10-30 23:49:02 +09:00
Dean Herbert
1035b5fb19
Fix hold to pause button not working when HUD is hidden
2022-10-30 21:38:45 +09:00
andy840119
a753369d3e
Reuse function TimeAtPosition() and PositionAtTime().
2022-10-30 17:21:50 +08:00
D.Headley
21d68bfb84
Delete unused button
2022-10-28 16:40:21 +02:00
Joseph Madamba
87328dd1f5
Fix bar hit error meter labels not clearing when setting to none
2022-10-27 23:59:01 -07:00
Dan Balasescu
51d8392e7f
Merge pull request #20982 from peppy/remove-obsoleted-simple
...
Clean up various obsoleted code
2022-10-28 14:36:04 +09:00
Dean Herbert
42eafe318c
Remove various simple obsoletions
2022-10-28 13:20:58 +09:00
Dean Herbert
71970d83cf
Remove obsoleted ShowProgressGraph global setting
...
This was moved to the component itself.
2022-10-28 12:47:45 +09:00
Joseph Madamba
0efbae6e70
Fix osu! logo drag area being a square
2022-10-26 18:33:07 -07:00
cdwcgt
6991195d69
let editor dim different from gameplay dim
2022-10-26 15:22:57 +09:00
Dean Herbert
2016d33055
Offset start of distance snap grid drawing if reference object's start time doesn't align
...
Closes #20938 .
2022-10-26 13:11:26 +09:00
Dean Herbert
7249542167
Merge pull request #20912 from LittleEndu/carousel-do-not-select-random
...
Make beatmap carousel select nearest to selection when selection was filtered
2022-10-26 11:40:56 +09:00
Dean Herbert
d9d083752a
Clamp backwards index to total current items to fix edge case of item removal
2022-10-26 11:03:11 +09:00
Bartłomiej Dach
f5ca447b8e
Rename one more "{duplicate -> clone}" reference
2022-10-25 21:34:41 +02:00
Bartłomiej Dach
bcdf24b972
Merge branch 'master' into add-editor-object-clone
2022-10-25 21:33:52 +02:00
Dean Herbert
cf3bf41b49
Harden and simplify logic to avoid weird issues
2022-10-25 18:57:15 +09:00
Dean Herbert
22ea9a8ab4
Add early return of carousel group has no items
2022-10-25 13:34:22 +09:00
cdwcgt
f9c6190426
Add DimAmount for UserDimContainer
2022-10-25 13:00:53 +09:00
Dean Herbert
2456a18bc1
Rewrite implementation to avoid duplicated LINQ returns
2022-10-25 12:48:17 +09:00
Dean Herbert
4d4f6e25ba
Rename to "clone" instead of "duplicate"
2022-10-25 11:43:23 +09:00
Dean Herbert
1e579e06f8
Fix duplicate working incorrectly if there is no selection currently made
2022-10-25 11:42:12 +09:00
Endrik Tombak
5a118cfdc3
Merge branch 'master' of https://github.com/ppy/osu into carousel-perform-selection
...
Conflicts:
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
2022-10-24 21:40:48 +03:00
cdwcgt
a2682b3ce3
background dim settings for editor
...
View -> Background Dim
follow `DimLevel` and `BlurLevel`
Co-Authored-By: Dead_Bush_Sanpai <DeadBushSanpai@yandex.com>
2022-10-24 23:55:33 +09:00
cdwcgt
de881cc5cb
useless #nullable disable
2022-10-24 23:17:28 +09:00
Dean Herbert
1d5df15027
Add ability to use Shift+Number to set current beat divisor in editor
2022-10-24 15:20:15 +09:00
Dean Herbert
e72a71a28e
Add simple editor "duplicate objects" key binding
2022-10-24 14:01:34 +09:00
Dean Herbert
6b26547d03
Merge pull request #20835 from frenzibyte/improve-hide-mouse-on-keyboard
...
Improve automatic cursor hiding logic and limit to gameplay screen
2022-10-20 11:44:20 +09:00
Dean Herbert
2f8a4fd2d0
Merge branch 'master' into remove-current-item
2022-10-20 10:02:09 +09:00
Dean Herbert
77b25c4a5c
Merge pull request #20788 from frenzibyte/handle-submitting-player-request-timeout
...
Fix potential exception in `SubmittingPlayer` token retrieval on request timeout
2022-10-20 09:51:57 +09:00
Salman Ahmed
4bf4938b72
Keep cursor hiding feature to gameplay screens for now
2022-10-20 03:44:58 +03:00
Dean Herbert
fbad33bef7
Adjust durations and make start off screen
2022-10-18 15:01:53 +09:00
Dean Herbert
84688b53a1
Merge branch 'fix-editor-padding' into player-loader-improvements
2022-10-18 14:52:59 +09:00
Dean Herbert
6a7f6c76ff
Fix osu! editor padding being applied to toolboxes
...
The result of https://github.com/ppy/osu/pull/20739 and https://github.com/ppy/osu/pull/20738 having unintended side effects when applied together.
2022-10-18 14:32:00 +09:00
Dean Herbert
0f809dcaa7
Merge branch 'master' into player-loader-improvements
2022-10-18 14:22:55 +09:00
Dean Herbert
516320edd9
Merge branch 'master' into handle-submitting-player-request-timeout
2022-10-17 18:51:13 +09:00
Dan Balasescu
4220d6b3fc
Merge pull request #20780 from outfoxxed/fix-hiterror-icons
...
Fix hit error bar icon orientation
2022-10-17 18:48:31 +09:00
Dean Herbert
1e7b8cd227
Fix formatting issues
2022-10-17 13:22:06 +09:00
Salman Ahmed
ae05f374a2
Fix potential invalid operation exception in SubmittingPlayer token retrieval
2022-10-17 03:26:29 +03:00
outfoxxed
85de802793
Only create hit error bar icon containers once
...
Move icon container creation to BDL, and only recreate the contained
icon when `recreateLabels` is called
2022-10-16 11:47:21 -07:00
outfoxxed
d6030891a2
Reuse existing code in hit error bar fix
...
Use `UprightAspectMaintainingContainer` instead of a local fix for
hit error bar orientation
2022-10-16 10:06:38 -07:00
outfoxxed
cd1885a17b
Fix hit error bar icon orientation
...
Icons now keep their original orientation when the hit error bar is
flipped
2022-10-16 02:55:10 -07:00
Salman Ahmed
324c749383
Merge branch 'master' into player-loader-improvements
2022-10-15 03:07:15 +03:00
Salman Ahmed
ba72f13f54
Merge branch 'master' into hide-mouse-on-keyboard-input
2022-10-14 22:26:30 +03:00
Dan Balasescu
10aabfc650
Merge pull request #20739 from peppy/settings-toolbox
...
Adjust visuals of settings toolboxes (gameplay loading screen and editor)
2022-10-14 20:31:05 +09:00
Dan Balasescu
dcb6357964
Add ability to remove the current item in multiplayer
2022-10-14 20:23:55 +09:00
Dan Balasescu
525f98c158
Fix max combo missing from playlists results screen
2022-10-14 18:01:54 +09:00
Salman Ahmed
01c65d3cc1
Remove seemingly unnecessary/leftover code
2022-10-14 02:16:36 +03:00
Dean Herbert
3645269108
Improve logo transition and reduce delay of exiting player loader in optimal conditions
2022-10-13 17:29:47 +09:00
Dean Herbert
b33935e392
Fix player loading screen settings scaling in
...
This always looked weird, and from the looks of the structure was
probably unintentional from the start (it is in the logo tracking
container for whatever reason).
2022-10-13 17:12:36 +09:00
Dean Herbert
15f9697c9f
Roughly update design of editor buttons
2022-10-13 16:57:25 +09:00
Dean Herbert
0f4a2a6059
Improve feel of settings toolbox group
2022-10-13 16:36:19 +09:00
Dean Herbert
c3902728f6
Reorganise beatmap snap control to work better in compact mode
2022-10-13 15:47:54 +09:00
Dean Herbert
a525b3f9f8
Reorder and rename toggle checkboxes to fit better
2022-10-13 15:44:33 +09:00
Dean Herbert
f6f5d33f53
Add slight padding to playfield (roughly matches stable)
2022-10-13 15:44:23 +09:00
Dean Herbert
ebc1088457
Merge pull request #20729 from frenzibyte/update-local-confirmation-dialog
...
Request user confirmation on updating locally-modified beatmaps
2022-10-13 12:36:37 +09:00
Dean Herbert
c9b4cacc20
Merge pull request #20724 from mk56-spn/Highest_Combo_Counter
...
Add "longest combo" counter to HUD components.
2022-10-13 12:26:49 +09:00
Salman Ahmed
964ed01abb
Add confirmation dialog for updating locally modified beatmaps
2022-10-13 02:40:15 +03:00
Dean Herbert
19f3810020
Revert namespace change
...
Let's not
2022-10-12 18:50:47 +09:00
Dan Balasescu
9473c350b5
Merge pull request #20266 from cdwcgt/catch-combo-hide
...
Fade out CatchComboDisplay when hide HUD
2022-10-12 16:59:07 +09:00
Dario Headley
b72c8970eb
Max Combo Counter added
2022-10-12 09:50:01 +02:00
Dan Balasescu
300888b423
Merge pull request #20720 from peppy/fix-welcome-intro-delay
...
Fix incorrect delay for non-theme music on "welcome" intro
2022-10-12 16:15:54 +09:00
Dean Herbert
d2d589a156
Expose HUD state via Player
2022-10-12 15:11:52 +09:00
Dean Herbert
1d6d047a69
Merge branch 'master' into master
2022-10-12 14:52:07 +09:00
Dean Herbert
d6998c810c
Fix incorrect delay for non-theme music on "welcome" intro
2022-10-12 14:51:14 +09:00
Dean Herbert
db148d145b
Fix incorrect offset logic for beatmaps without a preview point specified
2022-10-12 14:47:37 +09:00
Dean Herbert
ab24e87013
Merge branch 'master' into improve-drag-selection
2022-10-12 13:20:17 +09:00
Dean Herbert
a5948e7680
Merge pull request #20704 from ekrctb/scrolling-drag-box
...
Anchor editor drag box on time (catch, mania)
2022-10-12 11:48:05 +09:00
ekrctb
fcb9e2cc00
Refactor blueprint container drag code
2022-10-11 22:39:53 +09:00
Salman Ahmed
9b45a9cf76
Rename various cursor symbols
...
- `IProvideCursor.MenuCursor` -> `IProvideCursor.Cursor`
- `MenuCursor` -> `MenuCursorContainer
2022-10-11 16:21:01 +03:00
Dan Balasescu
cc0ca470f1
Merge pull request #20702 from peppy/update-prefer-no-video
...
Fix beatmap update button not respecting user "prefer no video" setting
2022-10-11 19:36:14 +09:00
Dan Balasescu
88e82d3154
Merge pull request #20681 from peppy/fix-hidden-hud-interaction
...
Fix HUD components being interactive even when the HUD is visually hidden
2022-10-11 17:19:27 +09:00
NotGumballer91
d18466d740
Fix delay inconsistency in IntroCircles.cs
2022-10-11 16:16:57 +08:00
NotGumballer91
5baad52a9e
Fix unintended delay on osu!theme
2022-10-11 16:15:56 +08:00
Dean Herbert
f41b79688f
Avoid casting by accepting all Playfields but throwing on a bad choice
2022-10-11 16:54:41 +09:00
Dean Herbert
a44ba579c5
Fix beatmap update button not respecting user "prefer no video" setting
...
Closes #20701 .
2022-10-11 14:27:40 +09:00
ekrctb
6ab29a62d0
Anchor drag box on time (catch, mania)
...
Not done for taiko because I cannot figure out how it should work with the overlapping scroll algorithm.
2022-10-11 14:23:17 +09:00
ekrctb
1a24762f9b
Improve drag box selection logic
...
`AllowDeselectionDuringDrag` is remove.
Instead, selected hit objects are not automatically deselected
when clock is seeked to a later time (the hit object is dead).
Update drag box selection even if mouse is not moved
(in case clock is running or scroll wheel is used).
2022-10-11 14:11:45 +09:00
Dean Herbert
cb21126623
Merge pull request #20586 from ekrctb/time-based-selection
...
Use hit object time for timeline drag selection instead of relying on blueprint
2022-10-11 13:20:15 +09:00
NotGumballer91
ef840e98cf
Update IntroCircles.cs
2022-10-11 01:49:53 +08:00
NotGumballer91
8a4f2efa14
Update IntroScreen.cs
2022-10-11 01:49:49 +08:00
NotGumballer91
9a3689b6e9
Update IntroCircles.cs
2022-10-10 21:04:14 +08:00
Dean Herbert
20adc522b9
Fix HUD components being interactive even when the HUD is visually hidden
2022-10-10 16:05:41 +09:00
Dan Balasescu
c18d4afdcc
Merge branch 'master' into fix-leaderboard-first-place-fade
2022-10-07 19:55:16 +09:00
Dan Balasescu
57e4d6cc4a
Merge pull request #20562 from peppy/fix-score-submission-crash
...
Fix potential crash when score submission token retrival fails
2022-10-07 19:24:35 +09:00
ekrctb
6164e0896a
Don't reselect already selected items in SelectAll
2022-10-07 10:46:07 +09:00
ekrctb
29cc554632
Ensure blueprint is added for selected hit object
2022-10-06 13:59:54 +09:00
ekrctb
0d448e6cc8
Fix items without blueprints are not deselected
2022-10-06 13:50:56 +09:00
ekrctb
b0213c29e9
Use mid time instead of start time
...
It is closer to the old blueprint-based behavior
2022-10-05 22:19:22 +09:00
ekrctb
6753f6b01a
Move AllowDeselectionDuringDrag down
...
Because it is now ignored in the timeline implementation anyways
2022-10-05 22:14:11 +09:00
ekrctb
3108c42ece
Fix inspect issues
2022-10-05 22:04:43 +09:00
ekrctb
00b3d97f69
Improve timeline selection performance
...
But selecting a large number of hit objects is still very slow
because all DHOs must be added
and also `AddBlueprintFor` has quadratic behaviors
2022-10-05 21:58:05 +09:00
ekrctb
0613388aaa
Make sure all selected items get deleted
2022-10-05 21:58:05 +09:00
ekrctb
0ffde02f79
Use hit object time for timeline selection
2022-10-05 21:51:01 +09:00
ekrctb
8d29e9e76b
Move selection logic from DragBox to BlueprintContainer
2022-10-05 21:51:01 +09:00
Dean Herbert
276021dd85
Remove now unnecessary ScheduleAfterChildren
2022-10-05 14:20:01 +09:00
Dean Herbert
c7d645b086
Merge branch 'master' into fix-gameplay-leaderboard-overlap
2022-10-05 14:15:50 +09:00
Dean Herbert
75b9bf2cf9
Merge branch 'master' into intel-exclusive-warning
2022-10-04 19:02:01 +09:00
Dean Herbert
d9f678d942
Change song select random key binding to not handle key repeat
2022-10-03 18:16:54 +09:00
Dean Herbert
42aac16b37
Adjust leaderboard score panels sizing based on accuracy/combo width
2022-10-03 18:12:36 +09:00
Dean Herbert
65369e96eb
Ensure token retrieval failure logic only runs once
2022-10-03 17:29:46 +09:00
Dean Herbert
c4dd23ed15
Log token retrieval failures even when gameplay is allowed to continue
2022-10-03 17:29:34 +09:00
Dean Herbert
4dbac917fc
Merge pull request #20547 from nanashi-1/solo-gameplay-leaderboard-max-combo
...
Display highest combo rather than current combo for local play on leaderboard
2022-10-03 16:57:05 +09:00
Salman Ahmed
a810afafb3
Reschedule results display delegate to avoid potential softlocks in the future
2022-10-02 15:37:56 +03:00
Salman Ahmed
59728b0ccb
Fix results display delegate potentially cancelled while not exiting
2022-10-02 15:30:06 +03:00
nanashi-1
2493468800
display highest combo instead of current combo
2022-10-02 18:40:31 +08:00
Dean Herbert
cbbca616c1
Merge branch 'master' into fix-leaderboard-first-place-fade
2022-09-28 17:58:45 +09:00
