1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Commit Graph

43337 Commits

Author SHA1 Message Date
Dean Herbert
4a65888cfc
Merge branch 'master' into multiplayer-chat 2021-08-17 17:34:23 +09:00
Dan Balasescu
bf8b42df06
Merge pull request #14358 from peppy/local-user-play-info
Add `LocalUserPlayInfo` interface to convey common information about player status
2021-08-17 16:56:54 +09:00
Dan Balasescu
b1efc6d763
Merge branch 'master' into local-user-play-info 2021-08-17 16:23:44 +09:00
Dean Herbert
6ee6a46894 Remove unnecessary public prefix in interface specification 2021-08-17 16:22:14 +09:00
Dean Herbert
6a2d82c81a Add test coverage 2021-08-17 16:17:31 +09:00
Dean Herbert
124f149cb5 Add key binding to focus chat input 2021-08-17 16:17:31 +09:00
Dean Herbert
30eee363dc Add chat display during multiplayer gameplay 2021-08-17 16:17:31 +09:00
Dean Herbert
b82f92d7b8 Adjust background colours of textbox in chat display 2021-08-17 16:16:49 +09:00
Dean Herbert
35b9f84c00 Expose StandAloneChatDisplay.Textbox 2021-08-17 16:16:49 +09:00
Dean Herbert
0d283aa6a3 Expose LocalUserPlaying from Player 2021-08-17 16:16:49 +09:00
Dean Herbert
e3b29df299 Add test scene for MultiplayerPlayer 2021-08-17 16:16:49 +09:00
Dan Balasescu
216abccf79
Merge pull request #14357 from frenzibyte/match-settings-overlay-focus
Fix `MatchSettingsOverlay` not properly resetting focus on hide
2021-08-17 16:16:21 +09:00
Dean Herbert
82eddeffef Add LocalUserPlayInfo interface to convey common information about player status 2021-08-17 16:15:47 +09:00
Salman Ahmed
3a7b9bf096 Fix MatchSettingsOverlay not resetting focus on hide properly 2021-08-17 08:56:49 +03:00
Dan Balasescu
66e33b3704
Merge pull request #14263 from frenzibyte/hide-player-settings-overlay
Hide non-interactive elements on multi-spectator players
2021-08-17 14:07:19 +09:00
Dan Balasescu
7fb3ad6437
Merge pull request #14352 from emu1337/strainskillchange
Refactor StrainSkill for more strain extensibility
2021-08-17 14:05:13 +09:00
smoogipoo
f4b7ee5c7f Merge branch 'master' into hide-player-settings-overlay 2021-08-17 13:44:33 +09:00
smoogipoo
081524b6c8 Privatise setters 2021-08-17 13:44:21 +09:00
smoogipoo
1e2c0031d7 Remove unused usings 2021-08-17 13:34:44 +09:00
Xexxar
9b21016eed accidently renamed osuStrainSkill, fixed 2021-08-16 22:46:56 +00:00
Xexxar
61045bd087 adjusted code comments 2021-08-16 22:36:14 +00:00
Xexxar
5561e4852e removed stuff 2021-08-16 22:23:40 +00:00
Xexxar
ae076c9a4e merged latest ppy/master 2021-08-16 22:20:12 +00:00
Xexxar
176b3e7533 changed decay system to allow for customizing the currentStrain 2021-08-16 22:14:29 +00:00
Xexxar
7d46b3f9c5 initial testing and debugging 2021-08-16 16:06:50 +00:00
Xexxar
19cdd5c323 recoded and added rhythm complexity calculator (untested) 2021-08-16 15:25:35 +00:00
Dean Herbert
4fb6f5c5ed
Merge pull request #14307 from jacobvm04/add-supporter-glow-changelog
Add glow to supporter promo on changelog
2021-08-17 00:11:27 +09:00
emu1337
df6e4664e0 changed history length in speed 2021-08-16 16:42:07 +02:00
Dean Herbert
8cba1f197b
Merge branch 'master' into add-supporter-glow-changelog 2021-08-16 23:41:46 +09:00
Dean Herbert
c3a8676932 Simplify size specifications 2021-08-16 23:38:13 +09:00
Dean Herbert
cb122eaf25
Merge pull request #14342 from frenzibyte/fix-difficulty-adjust-controls
Fix difficuly adjust settings controls not raising `SettingsChanged` events
2021-08-16 23:34:30 +09:00
Dean Herbert
139e69ed3b
Merge pull request #14343 from frenzibyte/hide-tablet-not-detected-when-disabled
Hide tablet settings content when disabled
2021-08-16 23:31:16 +09:00
Dean Herbert
7b74301fa1
Merge pull request #14341 from smoogipoo/fix-preview-track-crash
Fix crashes from preview tracks
2021-08-16 22:21:52 +09:00
Dean Herbert
5f006bd6e8
Merge pull request #14247 from kj415j45/localisation-settings
Add localisation support for most of Settings
2021-08-16 22:20:35 +09:00
Dean Herbert
c978e68742
Merge branch 'master' into add-supporter-glow-changelog 2021-08-16 22:09:52 +09:00
Dean Herbert
c3e6526350
Merge pull request #14344 from peppy/add-uo-keywords
Add keywords to make finding audio offset adjustments easier in settings
2021-08-16 22:08:57 +09:00
Dean Herbert
7e1086d901 Merge branch 'master' into hide-tablet-not-detected-when-disabled 2021-08-16 22:07:45 +09:00
Dean Herbert
568d027013 Simplify weird conditionals 2021-08-16 22:07:41 +09:00
Dean Herbert
8c3eb91059
Merge branch 'master' into localisation-settings 2021-08-16 20:03:06 +09:00
Dean Herbert
e485728109 Add keywords to make finding audio offset adjustments easier in settings 2021-08-16 19:54:45 +09:00
Salman Ahmed
e39a295c5c Hide tablet settings content when input handler is disabled 2021-08-16 13:45:50 +03:00
Dean Herbert
3ad7688eaf
Merge pull request #14339 from peppy/revert-breaking-config-rename
Revert "Rename element in OsuSettings enum"
2021-08-16 19:18:22 +09:00
Salman Ahmed
6653a78e65 Add test coverage 2021-08-16 12:48:49 +03:00
Salman Ahmed
855fff1486 Fix DifficultyAdjustSettingsControl.SliderControl not following up with the current pattern
This was causing any `ValueChanged` event bind (such as the one in
`SettingsItem` to invoke `SettingsChanged`) to be overwritten when
`Current` is set afterwards.
2021-08-16 12:47:58 +03:00
smoogipoo
db1a0ebb55 Fix preview track crashes 2021-08-16 18:46:44 +09:00
Dean Herbert
1c7cbc8621 Add missing readonly keyword to new bindable 2021-08-16 17:14:13 +09:00
Dean Herbert
8555a465ac
Merge pull request #14318 from bdach/editor-colours-save
Add support for saving edited combo colours and displaying them in composer
2021-08-16 17:07:53 +09:00
Dean Herbert
71fab416d8 Add a note against OsuSetting 2021-08-16 16:59:59 +09:00
Dean Herbert
fc89f2bac4 Revert "Rename element in OsuSettings enum"
This reverts commit c2bbe17562.
2021-08-16 16:56:48 +09:00
Dean Herbert
8d45f86bd3 Rename variable to better reflect its purpose 2021-08-16 16:48:40 +09:00