Wleter
40e99069fc
fix typos and newlines
2023-01-18 21:43:09 +01:00
Wleter
ab78dd0436
add collection of selection points.
2023-01-18 21:34:23 +01:00
Bartłomiej Dach
4a6f6300c5
Merge branch 'master' into fix-carousel-sort-change-after-play
2023-01-18 17:15:20 +01:00
Bartłomiej Dach
7ba448b13c
Update comment to match implementation
2023-01-18 17:12:57 +01:00
Wleter
c9375c056e
revert back name change
2023-01-18 15:54:24 +01:00
Salman Ahmed
12fc5da143
Merge branch 'master' into frame-stable-cache
2023-01-18 14:16:46 +03:00
Dean Herbert
3b27774561
Remove OnlineID
sort consideration
2023-01-18 19:21:02 +09:00
Dean Herbert
43a037c189
Merge pull request #21620 from mk56-spn/JudgementCounter
...
Add a judgement counter to skin components
2023-01-18 18:43:49 +09:00
Dean Herbert
ecb4727aec
Fix formatting issues
2023-01-18 17:33:14 +09:00
Dean Herbert
4cfb059170
Merge branch 'frame-stable-cache' into skin/argon-song-progress-cleaner
2023-01-18 17:21:08 +09:00
Dean Herbert
04705504c5
Move cache to more appropriate location
2023-01-18 17:19:57 +09:00
Dean Herbert
67b40dd234
Adjust the seek effect to feel better
2023-01-18 17:09:39 +09:00
Dean Herbert
01558a9199
Tidy up height logic and allow hovering above bar for easier interaction
2023-01-18 17:09:29 +09:00
Dean Herbert
f3677ab33d
Simplify depth change logic
2023-01-18 16:38:21 +09:00
Dean Herbert
7d0388c55c
Cache IFrameStableClock
in Player
for easier access
...
Allows directly referencing rather than going through `DrawableRuleset`.
Helps with testing and implementation of the new song progress display
(#22144 ).
2023-01-18 16:31:58 +09:00
Dean Herbert
42e9b2b48c
Tidy up clock logic in all SongProgress
classes
2023-01-18 16:29:42 +09:00
Dean Herbert
8bfd853889
Fix missing comment
2023-01-18 16:11:14 +09:00
Dean Herbert
bfb75730a9
Prefix subclasses of DefaultSongProgress
with Default
2023-01-18 15:45:16 +09:00
Dean Herbert
7266d8e10d
Move "show difficulty graph" settings back to respective implementations to avoid legacy version showing it
2023-01-18 15:31:55 +09:00
Dean Herbert
5a272b4bd6
Merge branch 'master' into skin/argon-song-progress-cleaner
2023-01-18 15:25:02 +09:00
Dean Herbert
742a026077
Add comment mentioning why reference clock fallback logic is required
2023-01-18 15:24:35 +09:00
Dean Herbert
e8770b84cd
Remove no longer necessary interface type
2023-01-18 15:23:55 +09:00
Dean Herbert
5429979049
Combine common code into SongProgress
base class
2023-01-18 15:23:55 +09:00
Dean Herbert
afc12e0b83
Tidy up ISongProgressBar
interface
2023-01-18 14:43:20 +09:00
Dean Herbert
4ad79a8a0a
Move IsLoaded
check inside BeatmapCarousel
2023-01-18 12:00:47 +09:00
Wleter
788033e1b8
fix unnecessary newline
2023-01-17 21:13:54 +01:00
Bartłomiej Dach
6f11fbdeed
Merge branch 'master' into fix-carousel-sort-change-after-play
2023-01-17 20:46:06 +01:00
Wleter
b8e6a2d87b
filter currentEndPointPositions
2023-01-17 20:41:49 +01:00
tsrk
f1989ba24d
quality: remove unused Darken
bindable boolean
2023-01-17 17:26:05 +00:00
Dean Herbert
8e1002b744
Fix song select potentially operating on Carousel
before it is fully loaded
...
Should fix test failures like
https://github.com/ppy/osu/actions/runs/3939620830/jobs/6739690253 .
2023-01-18 01:56:18 +09:00
tsrk
d91aa341e5
refactor(ArgonSongProgress): reorder layering and make density graph visible for past time
2023-01-17 13:16:56 +00:00
Dean Herbert
14649160e1
Adjust transform delay to make things feel more snappy
2023-01-17 18:39:21 +09:00
Dean Herbert
81aa7feeb5
Fix using FadeTo
on a visibility container
2023-01-17 18:39:21 +09:00
Dean Herbert
48959c0212
Start name not visible to avoid pop out when hidden on startup
2023-01-17 18:35:19 +09:00
Dean Herbert
7d1fd24ab4
Start all counters hidden to fix pop out animation when some portions are hidden
2023-01-17 18:31:25 +09:00
Dean Herbert
448abf897a
Tidy up direction assignment
2023-01-17 18:31:08 +09:00
Dean Herbert
ca17993769
Don't use OverlayContainer
(what)
2023-01-17 18:30:50 +09:00
Dean Herbert
181473c5fc
Rename flow to better match its purpose
2023-01-17 18:28:08 +09:00
Dean Herbert
35ad66eef9
Give flow container a type to avoid locally casting in every location
2023-01-17 18:27:33 +09:00
Dean Herbert
09c7ab3af6
Rename exposed settings to make more sense
2023-01-17 18:27:15 +09:00
Dean Herbert
f923dc5009
Use framework Direction
instead of local enum
...
It should be stable enough to use.
2023-01-17 18:27:15 +09:00
Dean Herbert
0a7d6948ca
Nest model class
2023-01-17 18:19:04 +09:00
Dean Herbert
b62b5714e8
Fix TierColours
assignment
2023-01-17 18:07:11 +09:00
Dean Herbert
65bd2e74fd
Merge branch 'master' into skin/argon-song-progress-cleaner
2023-01-17 18:00:42 +09:00
MK56
a55ce9b586
Merge branch 'master' into JudgementCounter
2023-01-17 09:55:45 +01:00
Dean Herbert
53e7873f6c
Merge branch 'master' into fix-pause-gameplay-action-not-closing
2023-01-17 17:41:16 +09:00
Joseph Madamba
da0eb9b0cb
Simplify TriggerClick
s in gameplay menu overlays
2023-01-17 00:34:52 -08:00
Dean Herbert
a9ac28b504
Add fallback sorts to CarouselBeatmapSet
to ensure stable sorting
2023-01-17 16:40:25 +09:00
Joseph Madamba
8f7cb18217
Use TriggerClick()
instead of calling BackButton
action for pause gameplay
2023-01-16 23:36:28 -08:00
Dean Herbert
9acf22b2b1
Merge branch 'master' into song_select_nullability
2023-01-17 15:29:37 +09:00
Dean Herbert
ef35493864
Avoid need for weird null check by reordering initialisation process
2023-01-17 15:27:21 +09:00
Dean Herbert
a02556d2fa
Move hover logic to SettingsToolboxGroup
to avoid expanded state clash
2023-01-17 14:43:22 +09:00
Dean Herbert
6a0bf89401
Merge branch 'master' into replay-menu-expanded-state-memory
2023-01-17 14:30:23 +09:00
Dean Herbert
4224907f08
Merge pull request #22208 from Feodor0090/editor-loc
...
Localise most visible parts of editor
2023-01-16 23:05:17 +09:00
OliBomby
832d033777
Fix merge issues
2023-01-16 01:09:04 +01:00
OliBomby
ab6bf6e1dc
Merge remote-tracking branch 'upstream/master' into carousel
2023-01-16 00:27:56 +01:00
OliBomby
1c0a650575
Fix typo
2023-01-16 00:17:26 +01:00
OliBomby
87ee9ab813
Added custom menu items in DrawableCarouselBeatmap
2023-01-16 00:13:12 +01:00
ansel
00acea59fc
Move some strings to common
2023-01-15 19:37:40 +03:00
mk56-spn
9a29c9ae26
remove hacky method to check if carousel is null
2023-01-15 15:32:53 +01:00
Dean Herbert
c5775aa452
Merge branch 'master' into song_select_nullability
2023-01-15 22:44:13 +09:00
Dean Herbert
4cf4a66858
Make MusicController
a required dependency of SongSelect
2023-01-15 22:43:30 +09:00
Dean Herbert
f7af5a8115
Revert some formatting changes
2023-01-15 22:39:00 +09:00
ansel
5d2e09137c
Remove text padding in editor menu for now
2023-01-15 14:40:53 +03:00
ansel
8777d5349b
Use existing strings
2023-01-15 14:39:34 +03:00
ansel
87650044bb
Localise create/save dialog
2023-01-15 01:50:47 +03:00
ansel
78e562903d
Localise part of editor
2023-01-15 01:50:47 +03:00
ansel
24df23f420
Localise background header
2023-01-15 01:49:19 +03:00
ansel
76eefc7573
Add support for localisation where it was missing
2023-01-15 01:46:11 +03:00
integer
a68d4fe5d1
make expansion to not use scheduler
2023-01-14 21:18:51 +00:00
Dean Herbert
4906f37109
Merge pull request #22181 from frenzibyte/attempt-fix-song-select-test-failure
...
Fix intermittent failure in beatmap carousel tests
2023-01-15 02:35:36 +09:00
integer
2831db53f7
fix wrong control flow on hover lost
2023-01-14 14:19:02 +00:00
ekrctb
e610d19d55
Merge branch 'master' into 18469
2023-01-14 19:53:08 +09:00
Dean Herbert
cfc8fd0aa1
Merge pull request #22188 from Feodor0090/nofs-locale
...
Localise some notifications
2023-01-14 18:12:54 +09:00
ansel
77e8315ee2
Adjust naming
2023-01-14 02:30:10 +03:00
ansel
f70dedfd17
Enable nullability for design screen
2023-01-14 02:24:48 +03:00
ansel
4b42240fba
Enable nullability for setup screen
2023-01-14 02:24:28 +03:00
ansel
78adaa9b03
Enable nullability for timing screen
2023-01-14 02:23:21 +03:00
integer
c3c1d77e8e
make PlayerSettingsGroup
expand on hover
2023-01-13 23:07:59 +00:00
integer
0b5c89d01f
revert additions to SessionStatics
2023-01-13 23:07:21 +00:00
ansel
515ada6815
Remove CanBeNull
where it's no longer requered
2023-01-13 23:11:50 +03:00
ansel
a41a031909
Localise some notifications
2023-01-13 23:11:25 +03:00
Salman Ahmed
112cf403ec
Fix intermittent failure in certain beatmap carousel tests
2023-01-13 19:41:44 +03:00
Dylan Nantz
6028abff39
Code Quality
2023-01-13 10:16:52 -05:00
Dylan Nantz
5dd0aaccef
Merge branch 'master' of https://github.com/ppy/osu into 18469
2023-01-13 09:54:29 -05:00
Dylan Nantz
e38075c4ef
Use PlacementState to check juice stream placement
2023-01-13 09:37:23 -05:00
mk56-spn
a6b6fb864e
Make carousel non nullable and ensure pre load usages of methods that reference it are protected against failure
2023-01-13 13:10:29 +01:00
mk56-spn
403ca05e5e
Enable nullability for song select
2023-01-13 00:52:14 +01:00
ansel
2365b065a4
Enable nullability for editor components
2023-01-12 18:07:54 +03:00
Ruki
4439698867
Update osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
2023-01-12 13:19:03 +01:00
Dean Herbert
d2309feec2
Merge branch 'master' into skin/argon-song-progress-cleaner
2023-01-12 19:49:27 +09:00
MK56
1597bcbb6f
Merge branch 'master' into JudgementCounter
2023-01-11 11:04:37 +01:00
Dean Herbert
df54410075
Fix skin fail sound not correctly playing
...
Closes #21719 . Tested using skin in issue thread.
2023-01-11 17:31:30 +09:00
Wleter
98ffcd33c7
Merge branch 'ppy:master' into SliderEnd-Snap
2023-01-10 21:22:13 +01:00
Wleter
88060a3ea0
add snapping for slider's end
2023-01-10 21:21:09 +01:00
Bartłomiej Dach
1eaabb5ca8
Merge branch 'master' into carousel_nullability_disabling_removal
2023-01-10 18:39:42 +01:00
Bartłomiej Dach
aab84d50eb
Remove boxing overhead in CarouselItem
comparator
2023-01-10 18:35:06 +01:00
Dean Herbert
3210586eb6
Merge pull request #21519 from mk56-spn/variable_BPM_counter
...
Add dynamic BPM counter to SkinEditor
2023-01-10 18:43:50 +09:00
Dean Herbert
60eeb4607c
Merge pull request #19528 from Joehuu/fix-op-non-current-onexiting
...
Fix online play screen only accounting for current sub screen onexiting blocks
2023-01-10 18:43:19 +09:00
Dean Herbert
37d219a8ad
Fix comments, remove fixed width on "bpm" text and adjust baseline adjust slightly
2023-01-10 18:20:39 +09:00