1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 06:19:38 +08:00
Commit Graph

54531 Commits

Author SHA1 Message Date
naoei
45e9eda9e7 Localise hit result name 2022-08-14 14:57:02 -04:00
naoei
18ce784ae0 Allow StatisticItem's name param to be nullable 2022-08-14 14:51:35 -04:00
Bartłomiej Dach
05ddfe7522
Merge branch 'master' into editor-setup-no-state-change 2022-08-14 18:21:31 +02:00
Dean Herbert
0d3cda3329
Merge pull request #19746 from bastianpedersen/beatmap-comments-image-not-visible
Make `CommentMarkdownTextFlowContainer` render images
2022-08-15 00:02:03 +09:00
basseX
383afe04f3 Remove not needed override 2022-08-14 15:15:36 +02:00
basseX
932becc4b2 Remove CommentMarkdownTextFlowContainer and rather use base-class OsuMarkdownTextFlowContainer 2022-08-14 10:11:49 +02:00
basseX
b05acb0073 Make CommentMarkdownTextFlowContainer render images 2022-08-13 21:32:24 +02:00
Dan Balasescu
c02990ad67
Merge pull request #19718 from peppy/fix-playlist-imported-items
Fix playlist overlay showing new imports when they don't match collection filter
2022-08-12 23:27:26 +09:00
Dan Balasescu
e6ecdf7457
Merge pull request #19715 from peppy/relax-mod-multiplier
Adjust various mod multipliers to avoid competition with normal scores
2022-08-12 23:12:57 +09:00
Dan Balasescu
9d1b0b5836 Revert sealing 2022-08-12 22:32:27 +09:00
Dean Herbert
e5e9841652 Apply multiple other mod debuffs as decided in pull request discussion 2022-08-12 18:58:09 +09:00
Dean Herbert
b76e5757e1 Fix InSelectedCollection not being applied to newly imported beatmaps 2022-08-12 15:06:34 +09:00
Dean Herbert
a90967715c Add test coverage of new imports not correctly being filtered by collection filter 2022-08-12 15:06:34 +09:00
Dean Herbert
5111bad86c Refactor TestScenePlaylistOverlay to use realm for testing
Removes the dual-purpose flow which existed only for testing.
2022-08-12 15:06:34 +09:00
Dan Balasescu
9dcf45079c
Merge pull request #19717 from peppy/visual-tests-development-directory
Update interactive visual test runs to use development directory
2022-08-12 15:00:39 +09:00
Dean Herbert
38afc53bad Update interactive visual test runs to use development directory 2022-08-12 13:40:29 +09:00
Dean Herbert
ac4213ecee Adjust relax mod multiplayer to 0.5x
Has previously been discussed internally. Probably good to get this out
before the next full reprocess of scores server-side.

The multiplier here was @smoogipoo's suggested value. I'd be willing to
go lower if this is seen at too high, but it should be a round number to
make it easy for users to understand the max score available to them.
2022-08-12 12:30:13 +09:00
OliBomby
3525dfb0f1 added merging feature 2022-08-12 01:17:33 +02:00
Dean Herbert
9148305fd8
Merge pull request #19657 from novialriptide/open-profile-hotkey
Add keybind for showing profile
2022-08-12 02:47:13 +09:00
Andrew Hong
667b700a28
Merge branch 'master' into open-profile-hotkey 2022-08-11 13:04:19 -04:00
Dean Herbert
b4af32efb7
Merge pull request #19708 from smoogipoo/fix-inspection
Fix possible null reference inspection
2022-08-11 21:52:09 +09:00
Dan Balasescu
d88f247594 Fix possible null reference inspection 2022-08-11 20:38:08 +09:00
Dan Balasescu
f29d1b2ded
Merge pull request #19001 from stanriders/pp-balancing
osu! performance points balancing pass
2022-08-11 20:31:33 +09:00
Dan Balasescu
9f28c4c033 Adjust test values 2022-08-11 19:47:32 +09:00
Dan Balasescu
61a3758cd9 Merge branch 'master' into pp-balancing 2022-08-11 19:46:16 +09:00
Dan Balasescu
9839d9933d
Merge pull request #19707 from peppy/api-run-loop-refactor
Refactor `APIAccess` main loop to read better
2022-08-11 19:44:01 +09:00
Dan Balasescu
d6c64af5e3
Merge branch 'master' into api-run-loop-refactor 2022-08-11 19:09:32 +09:00
Dan Balasescu
77cd279a76
Merge pull request #19706 from peppy/api-connected-state-refactor
Fix avatar potentially not loading in `LoginOverlay` due to misordered events
2022-08-11 19:08:25 +09:00
Dean Herbert
865d63f768 Refactor APIAccess main loop to read better 2022-08-11 15:43:39 +09:00
Dean Herbert
47196b19a5 Stop setting Online state in handleRequest
This is already handled amicably by the `Failing` -> `Connecting` flow.
Having this set in `handleRequest` throws things off, potentially
leading to the `Online` state change before the user has been populated.
2022-08-11 14:36:30 +09:00
Dean Herbert
7ec67c28b9 Set Online state sooner in connection process
This isn't really required as such, but feels more correct. There was no
reason for it to wait for the friend population to complete before
deeming things to be "online".
2022-08-11 14:35:56 +09:00
Dan Balasescu
65a1daf211
Merge pull request #15666 from MBmasher/fl-slider
Add slider bonus to Flashlight skill
2022-08-11 13:42:31 +09:00
Dan Balasescu
b18f9b39dc
Merge pull request #19702 from peppy/api-access-user-thread-safety
Add thread safety to `APIAccess.LocalUser`
2022-08-11 13:25:27 +09:00
Dean Herbert
e01383b138 Tidy up user passing logic 2022-08-11 13:17:17 +09:00
Dean Herbert
e5b534bb26 Add thread safety to APIAccess.LocalUser 2022-08-11 12:45:26 +09:00
Andrew Hong
60abe83398 Remove newline 2022-08-10 17:56:36 -04:00
naoei
7cbe2fa522 Enable localisation for SettingSourceAttribute 2022-08-10 16:12:16 -04:00
naoei
a42b8092af Change message type osu resume overlay 2022-08-10 16:09:58 -04:00
naoei
3e38baca3c Change ruleset mod description types 2022-08-10 16:09:11 -04:00
naoei
6e13cf82e8 Don't render statistic header if display string is null 2022-08-10 16:05:34 -04:00
naoei
1e356f6137 Revert localisation for GetDisplayNameForHitResult
Came across an issue where `LeaderboardScoreTooltip` attempts to capitalize all letters for the `displayName`.

Unsure if I should completely ignore it and localise it anyway.
2022-08-10 16:03:59 -04:00
naoei
60dae70a18 Change mod description type to LocalisableString 2022-08-10 15:54:48 -04:00
naoei
8cb2e11766 Change most ruleset-accessible string types to Localisable strings 2022-08-10 15:51:11 -04:00
its5Q
2499b7f0cd Add localisation support for beatmap editor setup 2022-08-11 03:53:20 +10:00
Andrew Hong
11d480997a
Merge branch 'master' into open-profile-hotkey 2022-08-10 13:34:53 -04:00
Andrew Hong
396860d9e8 Move Hide() to OsuGame 2022-08-10 13:32:33 -04:00
Dan Balasescu
7cac089246
Merge branch 'master' into fl-slider 2022-08-10 21:19:05 +09:00
Dan Balasescu
1721a91168
Merge pull request #19661 from peppy/overlay-key-binding-organisation
Reorganise global bindings and split out overlay bindings to make things easier to find
2022-08-10 21:18:28 +09:00
Dan Balasescu
98c7138803
Merge pull request #19586 from peppy/realm-versioning-for-debug
Version realm files for debug executions
2022-08-10 21:17:51 +09:00
Dan Balasescu
f9c6dc314b
Merge pull request #19678 from peppy/fix-file-comparisons-many-places
Fix audio track not correctly advancing when changing between certain beatmaps
2022-08-10 20:38:14 +09:00