Bartłomiej Dach
e7a266e742
Merge branch 'master' into fix-multiplayer-race
2022-05-26 20:43:20 +02:00
Dan Balasescu
0224947de0
Add comment about how starting gameplay works
2022-05-26 20:09:47 +09:00
Dan Balasescu
3915b8e414
Fix multiplayer race condition when starting gameplay
2022-05-26 20:01:33 +09:00
Dean Herbert
fb586fe0b2
Merge branch 'master' into editor-bottom-bar-new-design
2022-05-26 18:32:28 +09:00
Dean Herbert
7f4ea5d522
Use left alignment and remove hacky text positioning code
2022-05-26 18:12:28 +09:00
Bartłomiej Dach
f0303d76e8
Split off "select all mods" button to separate class
2022-05-25 22:18:30 +02:00
Dean Herbert
acd554d918
Update time info and add bpm
2022-05-25 23:54:59 +09:00
Dean Herbert
2c61a9d3d1
Update bottom bar components to new design language (mostly)
2022-05-25 23:54:59 +09:00
Dean Herbert
8791e3b9ef
Split BottomBar out of Editor
2022-05-25 23:54:59 +09:00
Dean Herbert
463b8130c8
Update editor screen switcher to match new design language
2022-05-25 22:31:27 +09:00
Dean Herbert
206f2ca208
Rename screen switcher control to be in line with naming expectations
2022-05-25 22:20:33 +09:00
Dean Herbert
c4cae7f677
Update EditorMenuBar to match new design language
2022-05-25 22:19:24 +09:00
Dan Balasescu
fb22801afb
Merge pull request #18388 from peppy/editor-timing-waveforms
...
Add waveform comparison view to editor timing screen
2022-05-25 20:15:25 +09:00
Dean Herbert
f1d4902be5
Remove unnecessary bindable cast
2022-05-25 19:25:23 +09:00
Dan Balasescu
f468d1eb16
Merge branch 'master' into editor-tidy-up
2022-05-25 11:58:34 +09:00
Bartłomiej Dach
5f6baaca13
Merge branch 'master' into editor-beat-divisor-size-static
2022-05-24 23:17:02 +02:00
Dan Balasescu
25f35b3408
Merge pull request #18394 from peppy/editor-beat-divisor-on-mouse-down
...
Handle beat divisor input on mouse down, rather than mouse up
2022-05-24 19:06:14 +09:00
Dan Balasescu
46b2f1ecc2
Merge pull request #18392 from peppy/editor-remove-triangle-button-usage
...
Remove `TriangleButton` usage in editor
2022-05-24 18:51:02 +09:00
Dean Herbert
0bcf8c846c
Change editor colour scheme to aquamarine
2022-05-24 18:43:22 +09:00
Dean Herbert
648cee7106
Remove editor screen transitions for now
2022-05-24 18:43:22 +09:00
Dean Herbert
3f5ccd4db8
Update timing screen sections to newer design metrics
2022-05-24 18:43:22 +09:00
Dean Herbert
c02ec05056
Remove remaining usage of EditorRoundedScreen
2022-05-24 18:43:22 +09:00
Dean Herbert
1d196262d0
Remove unused OnTimelineLoaded flow
2022-05-24 18:43:22 +09:00
Dean Herbert
a905731053
Update timeline colours and paddings to match new designs
2022-05-24 18:43:22 +09:00
Dean Herbert
17206bbebf
Update screen padding and colouring to better match new designs
2022-05-24 18:43:22 +09:00
Dean Herbert
a2bfd0ba41
Merge branch 'editor-remove-triangle-button-usage' into editor-combined
2022-05-24 18:43:02 +09:00
Dean Herbert
741cfcc614
Merge branch 'editor-beat-divisor-on-mouse-down' into editor-combined
2022-05-24 18:43:01 +09:00
Dean Herbert
3ace5f135e
Adjust marker to match design proportions
2022-05-24 18:26:01 +09:00
Dean Herbert
3c2e57bf00
Update BeatDivisorControl to better match new designs and metrics
2022-05-24 18:26:01 +09:00
Dean Herbert
e6087f5f5b
Handle beat divisor input on mouse down, rather than mouse up
...
It felt way too unresponsive.
2022-05-24 18:16:19 +09:00
Dean Herbert
4a88affd03
Move beat divisor tick size retrieval to static methods
2022-05-24 18:15:20 +09:00
Dean Herbert
a346990a8c
Remove TriangleButton usage in editor
2022-05-24 18:13:09 +09:00
Dean Herbert
1137545d4a
Fix Timeline potentially not updating visuals to correct state on first display
2022-05-24 18:11:05 +09:00
Dean Herbert
49a2173646
Avoid needlessly updating display (and add better documentation on chosen scale)
2022-05-24 14:36:44 +09:00
Dean Herbert
4fcdcef166
Add indexing on each wavefrom row
2022-05-24 14:36:44 +09:00
Dean Herbert
c1720c128d
Dim rows which are not part of the active control point (and offset centre)
2022-05-24 14:36:44 +09:00
Dean Herbert
7040dec013
Fix disabled bindable woes by not using TimingControlPoint.DEFAULT
2022-05-24 14:36:44 +09:00
Dean Herbert
588c5d1583
Add initial waveform comparison display
2022-05-24 14:36:44 +09:00
Susko3
88217e0c98
Adjust ScrollDelta usages to account for normalised IsPrecise values
2022-05-23 20:22:27 +02:00
Dan Balasescu
7d0470794b
Merge pull request #18353 from frenzibyte/spectator-catch-up-work-alt
...
Disallow multi-spectator player clocks from being started/stopped externally
2022-05-23 13:59:54 +09:00
Dan Balasescu
e3c1c78b17
Merge pull request #18348 from maromalo/mod-key-multiplayer
...
Add toggle mod hotkey support in multiplayer room
2022-05-23 13:45:02 +09:00
Dan Balasescu
f111d33b25
Merge pull request #18339 from peppy/editor-timing
...
Add first pieces of editor timing UI
2022-05-23 11:12:22 +09:00
Dean Herbert
9c3d0dafbd
Remove implementation at Player level
...
Turns out this isn't required in the end due to implementation at
`MasterGameplayClockContainer`.
2022-05-23 02:00:21 +09:00
Dean Herbert
c9ea87e6be
Revert easing for now
2022-05-23 00:03:42 +09:00
Dean Herbert
007582afb9
Remove unused usings resulting from namespace move
2022-05-22 23:55:33 +09:00
Dean Herbert
eabf578282
Use interface to convey beat sync information
2022-05-22 22:44:54 +09:00
maromalo
fc25d248ad
Test coverage + no virtual
2022-05-21 18:16:29 -03:00
Salman Ahmed
27da293b40
Make catch-up spectator clocks running state immutable externally
2022-05-21 17:12:04 +03:00
Dean Herbert
9a780bcad3
Remove unused using
2022-05-21 21:56:05 +09:00
Dean Herbert
376549ce09
Use ToLocalisableString instead of CurrentCulture
2022-05-21 21:48:51 +09:00
maromalo
2bd4c126d3
Blank line
...
Forgot to save.
2022-05-21 05:07:24 -03:00
maromalo
a7aa36a825
Add OnPressed to button
2022-05-21 04:55:42 -03:00
Dean Herbert
982856a8b2
Merge branch 'localisable-filter-items' into update-framework
2022-05-21 15:17:51 +09:00
Salman Ahmed
84a3cee452
Apply rate multiplier outside BPM rounding
2022-05-20 18:04:12 +03:00
Dean Herbert
4633eed78c
Merge branch 'master' into localisable-filter-items
2022-05-20 23:55:16 +09:00
Salman Ahmed
596853da8f
Fix song select potentially displaying BPM range with equal min/max values
2022-05-20 17:53:28 +03:00
Dean Herbert
8db80b92bb
Fix metronome not using EditorBeatmap causing editor updates to not propagate immediately
2022-05-20 23:24:57 +09:00
Dean Herbert
82eb5fd2c9
Add centre line on weight
2022-05-20 17:30:04 +09:00
Dean Herbert
2e21d75b10
Move metronome into own class and rename to avoid conflict with mod sounds
2022-05-20 17:30:04 +09:00
Dean Herbert
cf97f4e409
Add centre marker
2022-05-20 17:30:04 +09:00
Dean Herbert
4712e512d7
Apply edge smoothness and make weight more accented
2022-05-20 17:30:04 +09:00
Dean Herbert
8487d2c48a
Interpolate bpm label and fix incorrect angle logic
2022-05-20 17:30:04 +09:00
Dean Herbert
21072a26ef
Add locking wedge
2022-05-20 17:30:04 +09:00
Dean Herbert
79878a4ec2
Metrics adjust and labelling
2022-05-20 17:30:04 +09:00
Dean Herbert
cf1ef28f72
Add taper and more correctly shaped weight
2022-05-20 17:30:04 +09:00
Dean Herbert
42179568f3
Initial animation pass on metronome
2022-05-20 17:30:04 +09:00
Dean Herbert
ce7be940e2
Setup basics for control and test
2022-05-20 17:30:04 +09:00
Dan Balasescu
64a371638e
Merge pull request #18236 from peppy/snap-unification
...
Add `enum` to snap method as alternative to multiple nested invocations
2022-05-20 11:35:05 +09:00
Dean Herbert
363e7a6f53
Simplify toolbar hiding logic in FirstRunSetupOverlay
...
Rather than fiddling around with the activation modes, this seems like a
much cleaner way to make things work.
Closes https://github.com/ppy/osu/issues/18277 .
2022-05-19 16:42:48 +09:00
Dean Herbert
83e781d5a1
Allow localisation of PlaceholderText
2022-05-17 17:42:46 +09:00
Dean Herbert
17e0105c2c
Fix interaction with popover when textbox is disabled
2022-05-17 17:33:54 +09:00
Dean Herbert
3ff0399281
Split out LabelledTextBoxWithPopover for reuse
2022-05-17 17:33:54 +09:00
Dan Balasescu
a633501687
Change FilterTerms to use LocalisableString
2022-05-16 14:09:37 +09:00
Dean Herbert
328561f5c8
Merge pull request #18263 from frenzibyte/spotlight-beatmap-badge
...
Add support for "spotlight" label in beatmap overlay/listing
2022-05-15 12:32:20 +09:00
Dean Herbert
b6575c216b
Allow selecting all mods at free mod select using ctrl+a
2022-05-15 03:25:14 +09:00
Dean Herbert
8a01050168
Refactor mod select button initialisation to allow shared usage of deselect button
2022-05-15 03:16:43 +09:00
Salman Ahmed
88ba84ac9c
Replace Pill with Badge everywhere
2022-05-14 20:52:38 +03:00
Bartłomiej Dach
ab5c736da1
Merge branch 'master' into editor-readability
2022-05-13 21:10:48 +02:00
Dean Herbert
c4871ebcf4
Add editor track traversal keys (Z-V)
2022-05-14 02:50:51 +09:00
Dean Herbert
f22ff4e087
Remove editor animation toggling (replaced by overlap markers)
2022-05-12 19:28:56 +09:00
Dean Herbert
c0abce918f
Add enum to snap method as alternative to mutliple nested invocations
2022-05-12 16:19:07 +09:00
Dan Balasescu
c54ca937c5
Fix CI inspections
2022-05-12 14:55:20 +09:00
Dean Herbert
f51607521c
Fix distance snap providing zero-distance snaps incorrectly
2022-05-12 13:11:55 +09:00
Dean Herbert
5800d7e99d
Merge pull request #18220 from frenzibyte/control-popover-focus
...
Focus textbox upon opening control point popovers
2022-05-11 19:41:25 +09:00
Dan Balasescu
52c8382138
Merge pull request #18221 from peppy/multiplayer-leaderboard-hiding
...
Change multiplayer leaderboard to always hide during gameplay unless holding-for-HUD
2022-05-11 18:43:55 +09:00
Dean Herbert
d05cd69087
Change multiplayer leaderboard to always hide during gameplay unless holding-for-HUD
2022-05-11 16:12:54 +09:00
Dean Herbert
1c36995606
Expose HoldingForHUD state from HUDOverlay as bindable
2022-05-11 16:09:16 +09:00
Salman Ahmed
96db530de6
Focus textbox on control point popovers
2022-05-11 09:55:34 +03:00
Salman Ahmed
24432dffc4
Add support for focusing intermediate slider-textbox component
2022-05-11 09:53:04 +03:00
Salman Ahmed
0b597e712e
Fix timeline not handling mouse down events
2022-05-11 09:39:27 +03:00
Bartłomiej Dach
76c63f1d0a
Rename ModSelect{Screen -> Overlay} in place of removed old design
2022-05-10 22:56:50 +02:00
Bartłomiej Dach
4a3447f59f
Remove old free mod select overlay
2022-05-10 21:45:57 +02:00
Dean Herbert
a578f7a406
Force nested screens to load synchronously
2022-05-10 18:21:35 +09:00
Dan Balasescu
a16f2349aa
Fix next queued item not selecting after gameplay
2022-05-09 17:55:42 +09:00
Dean Herbert
ab1d46b71c
Merge pull request #17270 from frenzibyte/multiplayer-disable-adaptive-speed
...
Disable mod "Adaptive Speed" in multiplayer
2022-05-09 17:31:47 +09:00
Salman Ahmed
2f3ac61b47
Revert "Replace vertical scrolling in results screen with size-preserving container"
...
This reverts commit 298c2a1828
2022-05-09 10:35:14 +03:00
Salman Ahmed
422531d8ec
Revert "Remove no longer required constant"
...
This reverts commit 6f4cdccf6c
2022-05-09 10:35:13 +03:00
Salman Ahmed
3407a299ef
Revert "Revert scale locking changes for now"
...
This reverts commit e4521b1fff
2022-05-09 10:35:12 +03:00
Salman Ahmed
e4521b1fff
Revert scale locking changes for now
2022-05-09 10:16:57 +03:00
Salman Ahmed
6f4cdccf6c
Remove no longer required constant
2022-05-08 16:20:26 +03:00
Salman Ahmed
7f1ad149d5
Remove no longer necessary horizontal scroll blocker
2022-05-08 16:04:24 +03:00
Salman Ahmed
298c2a1828
Replace vertical scrolling in results screen with size-preserving container
2022-05-08 16:03:57 +03:00
Bartłomiej Dach
cbd1169495
Move cache declarations of ISamplePlaybackDisabler to interface
2022-05-08 10:38:58 +02:00
Bartłomiej Dach
9ae019eb39
Move ISamplePlaybackDisabler to more general namespace
2022-05-08 10:38:58 +02:00
Dean Herbert
0d32bf91eb
Hardcode hide key handling in ModSelectScreen
2022-05-08 01:35:11 +09:00
Bartłomiej Dach
9a56f6db44
Merge branch 'mod-overlay/back-button' into mod-overlay/integration
2022-05-07 13:15:13 +02:00
Salman Ahmed
d4c9de8596
Move button width in mod select to constant
2022-05-07 13:23:48 +03:00
Salman Ahmed
a44e21d1b2
Merge branch 'master' into mod-overlay/localisation-strings
2022-05-07 12:13:28 +03:00
Bartłomiej Dach
e7e7486a8e
Merge branch 'mod-overlay/back-button' into mod-overlay/integration
2022-05-07 10:59:30 +02:00
Salman Ahmed
db04bcf1ce
Merge branch 'master' into distance-snap-grid-current-tiume
2022-05-07 11:47:38 +03:00
Bartłomiej Dach
6ad990dfc3
Add basic localisation strings for new mod select
2022-05-07 10:17:24 +02:00
Bartłomiej Dach
4ff96f82be
Dim other buttons if customisation panel is open
2022-05-07 09:50:09 +02:00
Bartłomiej Dach
852e4a9766
Add select/deselect all buttons to free mod select screen
2022-05-07 09:29:33 +02:00
Bartłomiej Dach
202a603d72
Merge branch 'master' into distance-snap-grid-current-tiume
2022-05-07 08:49:30 +02:00
Dean Herbert
dd63657dfb
Merge pull request #18065 from huoyaoyuan/code-style
...
Enforce code style analysis shipped with .NET SDK
2022-05-07 14:58:19 +09:00
Dean Herbert
71758390b5
Fix time based distance grid alpha not correctly accounting for distance spacing multiplier
2022-05-07 13:37:36 +09:00
Salman Ahmed
723fce8174
Move inverting value to happen outside clamp
...
Looks to have no effect, but makes sense to happen outside instead.
2022-05-06 18:54:13 +03:00
Salman Ahmed
d78f1d158d
Use GetEndTime() instead of StartTime
...
Companion to
246479bf34
2022-05-06 18:51:35 +03:00
Salman Ahmed
112496204d
Make nested class private
2022-05-06 18:50:28 +03:00
Salman Ahmed
3077d398ef
Merge branch 'master' into distance-snap-grid-current-tiume
2022-05-06 18:20:22 +03:00
Salman Ahmed
144d33f0d2
Merge branch 'master' into distance-snapping-test
2022-05-06 17:29:27 +03:00
Bartłomiej Dach
56fa5c9db1
Merge branch 'master' into editor-drag-box
2022-05-06 15:22:39 +02:00
Bartłomiej Dach
29a3ab7e7a
Halve drag box padding
...
Allows the drag box borders to collapse in on themselves to a single
line if the drag selection has zero width or height.
2022-05-06 15:21:35 +02:00
Dean Herbert
fad1f727bb
Fix editor drag box visuals
2022-05-06 20:34:44 +09:00
Dean Herbert
69592722f8
Highlight distance snap grid rings that are close to the current time value
2022-05-06 18:30:46 +09:00
Dean Herbert
118e58888b
Rename incorrectly named variable (radius is not diameter)
2022-05-06 17:51:51 +09:00
Dean Herbert
37cbc79283
Fix clamping logic to always clamp to the last displayed tick
2022-05-06 17:09:38 +09:00
Dean Herbert
684fef7f8c
Fix MaxIntervals incorrectly factoring distance spacing multipiler into snap calculation
2022-05-06 17:09:02 +09:00
Bartłomiej Dach
f5026bbbeb
Bind to button's activation delay directly
2022-05-06 10:04:36 +02:00
Bartłomiej Dach
f39fcee41b
Remove commented-out code
2022-05-06 10:04:00 +02:00
Dean Herbert
246479bf34
Fix snap extent not working correctly on sliders (and providing incorrect time values)
2022-05-06 15:54:37 +09:00
Dean Herbert
32b40bdabf
Rename DistanceBetweenTick to be plural
2022-05-06 15:45:36 +09:00
Dean Herbert
78959a6e05
Add animation to denote a dangerous player exit
2022-05-06 15:02:22 +09:00
Dean Herbert
1c4aa12585
Rename non-descript Button nested class
2022-05-06 14:45:53 +09:00
Dean Herbert
a11771c11b
Better encapsulate exposed bindables of HoldToConfirmContainer
2022-05-06 14:45:53 +09:00
Dean Herbert
be960eb092
Move dangerous hold specification to base class
2022-05-06 14:34:31 +09:00
Dean Herbert
0d8e42b941
Merge branch 'master' into exit-multiplayer-is-dangerous
2022-05-06 14:25:18 +09:00
Dean Herbert
641584a049
Merge branch 'master' into multiplayer-disable-adaptive-speed
2022-05-06 14:00:44 +09:00
Bartłomiej Dach
34cf4c6a38
Fix mod overlay not closing on toggle hotkey
2022-05-05 22:16:56 +02:00
Bartłomiej Dach
0caea77176
Fix mod selects not hiding when their owner screens exit
2022-05-05 22:16:55 +02:00
Bartłomiej Dach
a56eab2c47
Extract interface for overlay management
2022-05-05 22:16:55 +02:00
Bartłomiej Dach
66473972da
Use new user mod select design in multiplayer lobby
2022-05-05 22:16:55 +02:00
Bartłomiej Dach
4eefbd5bc2
Use new free mod select design in room creation flow
2022-05-05 22:16:54 +02:00
Bartłomiej Dach
ac08498f35
Use plum colour scheme in multiplayer to match rest of multiplayer screens
2022-05-05 22:16:54 +02:00
Bartłomiej Dach
1744d7e4f0
Fix new mod select overlay dimming itself
2022-05-05 22:16:54 +02:00
Bartłomiej Dach
407db7ff9d
Replace old mod select overlay with new design
2022-05-05 22:16:54 +02:00
Dean Herbert
5029710de7
Merge branch 'master' into distance-snapping-test
2022-05-05 22:00:40 +09:00
Bartłomiej Dach
a859ca0b89
Merge branch 'master' into playlist-keyboard-traversal
2022-05-05 14:45:58 +02:00
Salman Ahmed
8501a41619
Bring back separate bool properties as non-cascading
2022-05-05 14:37:38 +03:00
Bartłomiej Dach
a9eae3a544
Merge branch 'master' into snapping-tidy-distance
2022-05-05 13:15:24 +02:00
