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
ansel
88c3eef8e1
Add test case with no existing comments
2023-01-14 20:59:13 +03:00
Dean Herbert
efe6dae672
Merge pull request #22200 from bdach/user-profile/update-design-basics
...
Update user profile appearance to closer match web
2023-01-15 02:50:11 +09: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
ansel
fbb674d8e9
Rename parent comment id field
2023-01-14 20:15:19 +03:00
Bartłomiej Dach
67a3ea2c59
Fix wrong date colour of kudosu history items
2023-01-14 17:50:18 +01:00
Bartłomiej Dach
bfca75395b
Adjust colour of top header container
2023-01-14 17:37:33 +01:00
Bartłomiej Dach
6a9d842660
Adjust user profile header detail appearance
2023-01-14 17:37:31 +01:00
Bartłomiej Dach
de077403e9
Adjust visual appearance of profile value displays
2023-01-14 17:37:28 +01:00
Bartłomiej Dach
f80dddbb5e
Rearrange and adjust header components where simple
2023-01-14 17:17:28 +01:00
Bartłomiej Dach
e39eb089ce
Update colouring of some profile section elements
2023-01-14 17:17:26 +01:00
Bartłomiej Dach
5b1111c6b1
Adjust appearance of user profile sections
2023-01-14 17:17:24 +01:00
Bartłomiej Dach
3f81f173fb
Adjust appearance of section navigation
2023-01-14 17:17:21 +01:00
Bartłomiej Dach
49e08c06a6
Adjust general appearance of user profile overlay
2023-01-14 16:59:51 +01:00
Bartłomiej Dach
5e1ea8b34f
Merge branch 'master' into move-overlay-ruleset-selectors
2023-01-14 15:22:14 +01:00
integer
2831db53f7
fix wrong control flow on hover lost
2023-01-14 14:19:02 +00:00
Dean Herbert
2f2ab445c9
Merge pull request #22182 from stanriders/status-icon
...
Update status icon design
2023-01-14 21:05:44 +09: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
Dean Herbert
a6e7efa62c
Merge pull request #22194 from Feodor0090/more-editor-nrt
...
Enable nullability for setup, design and timing editor screens
2023-01-14 18:11:46 +09:00
StanR
e07c0c7c1f
Using
2023-01-14 02:58:18 +03:00
ansel
bb8bcd7248
Move avatar update bind to LoadComplete
2023-01-14 02:50:30 +03:00
ansel
c95d8645f3
Revert "Use existing string"
...
This reverts commit f950b624ae
2023-01-14 02:42:04 +03:00
ansel
9e7ecbf4a1
Adapt to changes in base class
2023-01-14 02:41:11 +03:00
ansel
e9995410e8
Merge branch 'master' into comment-editor-3
2023-01-14 02:32:06 +03:00
StanR
cb4f32e7bd
Use StatusIcon in UserDropdown
2023-01-14 02:31:27 +03:00
ansel
77e8315ee2
Adjust naming
2023-01-14 02:30:10 +03:00
StanR
e2d6e31314
Using
2023-01-14 02:26:26 +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
StanR
660bf748d5
Fix GroupBadge crashing on null group colour
2023-01-14 02:23:08 +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
StanR
85b2154f3a
Set border colour to white
2023-01-14 01:12:17 +03:00
Bartłomiej Dach
ab3d39a940
Merge branch 'master' into comment-editor-1
2023-01-13 22:41:41 +01:00
ansel
d67184bd80
Autoformat code
2023-01-14 00:26:44 +03:00
ansel
f950b624ae
Use existing string
2023-01-14 00:26:35 +03:00
Joseph Madamba
5750d82c0a
Move overlay ruleset selectors to tab control
2023-01-13 12:50:35 -08:00
StanR
2e28f5ed33
Add StatusIcon
2023-01-13 23:18:24 +03: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
ansel
c62d416680
Add localisation for notification overlay
2023-01-13 22:54:38 +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
Dean Herbert
11f630d49d
Prefill username and email
2023-01-13 15:42:34 +09:00
Dean Herbert
4d58e6d8d2
Add UI support for redirecting the user to web registration
2023-01-13 15:36:45 +09:00
Dean Herbert
a7327b02a2
Add API level support for error message and redirect during registration flow
2023-01-13 15:32:53 +09:00
Dean Herbert
5658c3a123
Enable NRT on account creation classes
2023-01-13 15:29:25 +09:00
Dean Herbert
6daa37bd3e
Merge pull request #22168 from Joehuu/fix-mute-button-closing-overlays
...
Fix mute button not blocking outside overlay closing presses
2023-01-13 12:35:03 +09:00
Joseph Madamba
5a38abe679
Add comment highlighting reason for blocking mouse down
2023-01-12 19:32:53 -08:00
Dean Herbert
55f1c7c49d
Merge pull request #22160 from EVAST9919/ruleset-selector-online
...
Don't display custom rulesets in online overlays
2023-01-13 12:16:42 +09:00
Dean Herbert
464c5eaa2f
Fix grammar
2023-01-13 12:16:35 +09:00
Dean Herbert
73189e49ab
Merge pull request #22163 from frenzibyte/fix-intermittent-channel-test-failure
...
Fix intermittent failure in silenced user messages test
2023-01-13 11:23:45 +09:00
Dean Herbert
ea4eb6055e
Merge pull request #22169 from Feodor0090/timeline-nullability
...
Enable nullability for editor components
2023-01-13 11:21:42 +09:00
mk56-spn
403ca05e5e
Enable nullability for song select
2023-01-13 00:52:14 +01:00
ansel
c554a34eaf
Add "fps" keyword to frame limiter dropdown
2023-01-13 02:11:05 +03:00
Joseph Madamba
a16050534d
Fix mute button not blocking outside overlay closing presses
2023-01-12 14:20:16 -08:00
Andrei Zavatski
d74a5ef9e6
Use property instead of ctor parameter
2023-01-12 23:26:29 +03:00
Andrei Zavatski
a7ac31fa34
Use IsLegacyRuleset extension method
2023-01-12 23:21:33 +03:00
Salman Ahmed
115cb0d297
Fix channel manager test scene not waiting for notifications client connection
2023-01-12 23:14:23 +03:00
Andrei Zavatski
1dae1149cb
Don't display non-legacy rulesets in beatmap listing
2023-01-12 22:52:45 +03:00
Andrei Zavatski
a9915d6a64
Make OverlayRulesetSelector display only legacy rulesets
2023-01-12 22:44:41 +03:00
ansel
0bd1c46c74
Undo sizing changes
2023-01-12 19:48:11 +03: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
Dean Herbert
123c477e00
Merge branch 'master' into ui/segmented-graph
2023-01-12 19:02:49 +09:00
tsrk
bb2ece5c71
refactor(SegmentedGraph): adjust tierCount based on passed Colours
2023-01-12 10:57:12 +01:00
Dean Herbert
c22994c1c6
Merge pull request #22151 from smoogipoo/fix-incorrect-legacy-combo
...
Fix incorrect max combo after watching imported legacy replays
2023-01-12 18:55:21 +09:00
tsrk
7cbc03dce6
refactor(SegmentedGraph): use (get/set)ters to expose TierColour
2023-01-12 10:13:16 +01:00
Dean Herbert
4ab2a5cbb4
Merge pull request #22141 from frenzibyte/fix-game-load-order
...
Fix game-level components not finishing load before game content
2023-01-12 17:31:13 +09:00
Salman Ahmed
0548ca2aa8
Avoid changing target content midway through code
2023-01-12 09:48:38 +03:00
Dan Balasescu
bbec42c00e
Fix incorrect max combo after watching imported legacy replays
2023-01-12 14:18:21 +09:00
Dean Herbert
7cf58190a9
Merge pull request #22006 from bdach/user-profile/ruleset-switching
...
Add ruleset switching to user profile overlay
2023-01-12 13:54:13 +09:00
Dan Balasescu
844fc549e2
Merge pull request #22149 from Joehuu/fix-beatmap-set-lookup-type
...
Fix lookup type being incorrect when fetching beatmap set
2023-01-12 13:00:44 +09:00
Dan Balasescu
baf20a6b50
Merge pull request #22136 from peppy/fix-kiai-flash-intensity
...
Fix kiai flash opacity on legacy skins being too intense
2023-01-12 12:56:57 +09:00
Joseph Madamba
2076f9fd08
Fix lookup type being incorrect when fetching beatmap set
2023-01-11 19:08:11 -08:00
tsrk
5694487a7b
fix(SegmentedGraph): update graphNeedsUpdate variable during Update() loop
2023-01-12 02:36:35 +01:00
ansel
51e21ee6f0
Make snapped time always positive
2023-01-12 03:38:57 +03:00
tsrk
624e90b213
style: nitpicks
2023-01-11 21:32:12 +01:00
Salman Ahmed
6c52b8339b
Fix game-level components finishing load after content
2023-01-11 22:02:06 +03:00
Bartłomiej Dach
52eabbf224
Merge branch 'master' into user-profile/ruleset-switching
2023-01-11 19:11:40 +01:00
Bartłomiej Dach
e0c2542968
Merge branch 'master' into fix-fail-sound-not-playing
2023-01-11 16:41:48 +01:00
tsrk
6249322a32
fix(SegmentedGraph): solve issue for negatives values
2023-01-11 14:03:36 +01:00
tsrk
e128b9ee5c
fix(SegmentedGraph): make ctor public
2023-01-11 14:03:19 +01:00
Dean Herbert
e9571be4ab
Fix incorrect application layer causing completely discoloured circles
2023-01-11 19:29:17 +09:00
Dean Herbert
a87debab0f
Fix kiai flash opacity on legacy skins being too intense
2023-01-11 19:29:17 +09:00
tsrk
42ff8c75fa
refactor: make class not abstract
2023-01-11 11:22:18 +01:00
tsrk
578d16f2bc
perf: Do not draw sectoins that are less than 1px
2023-01-11 11:11:31 +01:00
MK56
1597bcbb6f
Merge branch 'master' into JudgementCounter
2023-01-11 11:04:37 +01:00
Dean Herbert
08ca62205a
Merge pull request #22123 from stanriders/group-badges
...
Implement user group badges
2023-01-11 18:42:50 +09:00
Dean Herbert
2dcc61caf5
Add extra level of nullabiliy checking because NRT is not present
2023-01-11 17:38:08 +09: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
