1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-30 05:47:25 +08:00
Commit Graph

37205 Commits

Author SHA1 Message Date
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
1e5dd9165a Adjust SkinnableTestScene to give more breathing room to RelativeSize components 2023-01-18 15:37:46 +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
f7c4199a77
Merge pull request #22262 from Joehuu/chat-mention-user
Add ability to easily mention users in chat by right clicking username
2023-01-18 13:30:02 +09:00
Dean Herbert
736ff419c0
Merge pull request #22261 from peppy/fix-bad-operation
Fix song select potentially operating on `Carousel` before it is fully loaded
2023-01-18 12:06:33 +09:00
Dean Herbert
4ad79a8a0a Move IsLoaded check inside BeatmapCarousel 2023-01-18 12:00:47 +09:00
Dean Herbert
0a47dc733f
Merge pull request #22268 from Feodor0090/comments-margin
Reduce padding for too nested comments
2023-01-18 11:45:41 +09:00
ansel
ca3be71381 Track comment's nesting and reduce padding for too nested 2023-01-18 02:11:07 +03:00
ansel
12544c16ea Remove canBeNull 2023-01-18 02:10:02 +03:00
Joseph Madamba
dfea42fd16 Add space after username mention 2023-01-17 14:13:50 -08:00
Joseph Madamba
254c881ded Also check null for bindable channel value 2023-01-17 14:12:48 -08:00
Bartłomiej Dach
f7c942ac10
Move user stats into detail header container 2023-01-17 22:32:24 +01:00
Bartłomiej Dach
7a475d9cf8
Move out stats from top header container 2023-01-17 22:32:15 +01:00
Bartłomiej Dach
350cce1315
Move contents of detail header to separate component 2023-01-17 22:32:12 +01:00
Bartłomiej Dach
f5459909f9
Merge branch 'master' into comment-editor-3 2023-01-17 21:31:08 +01:00
Bartłomiej Dach
3640342805
Add logging on comment post failure 2023-01-17 21:30:46 +01:00
Bartłomiej Dach
6f11fbdeed
Merge branch 'master' into fix-carousel-sort-change-after-play 2023-01-17 20:46:06 +01:00
Joseph Madamba
97bd76efc6 Add ability to easily mention users in chat by right clicking username 2023-01-17 10:01:07 -08: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
26cd70f2bf Always use production (non-experimental) endpoints for tournament client 2023-01-17 18:46:06 +09: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
Dean Herbert
a1152fa0db
Merge pull request #22147 from Feodor0090/forbid-negative-snap
Forbid negative time snap in editor
2023-01-17 17:35:45 +09:00
Joseph Madamba
da0eb9b0cb Simplify TriggerClicks in gameplay menu overlays 2023-01-17 00:34:52 -08:00
Dean Herbert
c799375ae0
Merge pull request #20709 from Domilz/toolbar-localisation
Localise toolbar home button and ruleset description tooltips
2023-01-17 17:28:34 +09: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
Joseph Madamba
08c570849f Simplify container logic 2023-01-16 23:24:47 -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
776b6fa2e1
Merge pull request #22203 from bdach/fix-new-diff-creation-fail
Fix difficulty creation flow failing for some ruleset combinations
2023-01-17 14:08:34 +09:00
Dean Herbert
1f47def3c4
Merge branch 'master' into skin-editor-loc 2023-01-17 11:53:08 +09:00
Bartłomiej Dach
0c5a436754
Merge pull request #22241 from stanriders/refactor-levelbadge
Refactor `LevelBadge` to use `LevelInfo`
2023-01-16 23:33:03 +01:00
Bartłomiej Dach
f79037cefb
Move to LoadComplete() better 2023-01-16 21:47:31 +01:00
StanR
3f75506552 Move binding to LoadComplete 2023-01-16 23:42:07 +03:00
StanR
c5d09c0e2c
Rename variable
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-16 23:36:50 +03:00
StanR
6207a96a29 Refactor LevelBadge to use LevelInfo 2023-01-16 23:24:09 +03:00
ansel
133b9b79d7 Do not touch "currently editing" line 2023-01-16 22:52:17 +03:00
Bartłomiej Dach
bf58fe21ce
Merge branch 'master' into beatmap-set-converted-beatmaps 2023-01-16 20:46:41 +01:00
ansel
17aeb0ec19 Localise editor's UI 2023-01-16 19:55:28 +03:00
ansel
6eb5508404 Localise menu bar 2023-01-16 19:39:50 +03:00
ansel
26f3b1dbfe Localise "revert to default" tooltip 2023-01-16 19:37:47 +03: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
Dean Herbert
988544073c
Merge branch 'master' into ruleset-settings-loc 2023-01-16 13:29:15 +09:00
Dean Herbert
d19b35bd5f Rename ambiguous translation keys 2023-01-16 13:18:49 +09:00
Joseph Madamba
6a847faea9 Make home string keys more specific 2023-01-15 15:23:26 -08:00
Joseph Madamba
0ff143d4c8 Add argument for play some ruleset string 2023-01-15 15:23:26 -08:00
Joseph Madamba
ae49e724e4 Move converted beatmap icons logic locally 2023-01-15 15:09:25 -08:00
Joseph Madamba
b733f46c6f Apply NRT to BeatmapPicker 2023-01-15 15:09:25 -08:00
Joseph Madamba
27671f0401 Merge remote-tracking branch 'upstream/master' into pr/20709 2023-01-15 15:08:11 -08:00
Joseph Madamba
85c1932851 Mark Converts as nullable 2023-01-15 12:46:41 -08:00
ansel
6f84641596 Localise osu!mania settings 2023-01-15 23:30:20 +03:00
ansel
9ce7c51b14 Localise osu! settings 2023-01-15 23:29:58 +03: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
Salman Ahmed
13c1b8f5a4 Fix intermittent failure in tests with restarting player instances 2023-01-15 16:06:06 +03: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
Joseph Madamba
627d1725c3 Fix kudosu wiki link from user profile not linking to in-game overlay 2023-01-14 19:56:51 -08: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
ansel
1480c691ae Explain empty string in editor's footer 2023-01-14 23:42:56 +03:00
ansel
c36922dd2c Use clock to obtain a position for comment insertion 2023-01-14 22:57:51 +03:00
ansel
c2bb0949f5 Take type and id from container directly on submit 2023-01-14 22:57:23 +03:00
ansel
cdf3aafddd Add check for any drawables in content before looking for placeholder 2023-01-14 22:37:05 +03:00
Bartłomiej Dach
a9facc076f
Fix difficulty creation flow failing for some ruleset combinations
In current `master`, the difficulty creation flow would retrieve a
"reference beatmap" to copy metadata and timing points from using
`GetPlayableBeatmap()`. But, importantly, it was calling that method
using *the ruleset of the new difficulty* rather than the ruleset of the
existing one. This would make the difficulty creation flow fail if the
beatmap couldn't be converted between rulesets (like taiko to catch).

Fixing to use the reference beatmap's actual ruleset would be trivial,
but there's no real reason to do all of that work anyway when a
`WorkingBeatmap` is available. Because getting a playable beatmap is not
required to copy across metadata and timing points, remove the
`GetPlayableBeatmap()` step entirely to fix the bug.

Closes #22145.
2023-01-14 19:46:55 +01:00
Joseph Madamba
e7ab543799 Add ability to view converted beatmaps on beatmap set overlay 2023-01-14 10:26:21 -08:00