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

43371 Commits

Author SHA1 Message Date
Dan Balasescu
eaf7bd72fc
Merge branch 'master' into multiplayer-chat 2021-08-17 20:08:01 +09:00
Dan Balasescu
d8e9845d00
Merge pull request #14360 from peppy/improve-timeline-tick-visibility
Improve visibility of repeat ticks / drag areas on timeline
2021-08-17 20:06:49 +09:00
Dean Herbert
4b55ba7fa4
Merge pull request #14274 from smoogipoo/multi-polling-request-refactor
Refactor multiplayer/playlist polling out of RoomManager
2021-08-17 18:26:25 +09:00
Dean Herbert
f16468b706 Improve visibility of repeat ticks / drag areas on timeline 2021-08-17 18:17:55 +09:00
Dean Herbert
4a65888cfc
Merge branch 'master' into multiplayer-chat 2021-08-17 17:34:23 +09:00
Dean Herbert
ef9bfece13
Merge branch 'master' into multi-polling-request-refactor 2021-08-17 17:31:25 +09:00
Dean Herbert
3b5fc6d10f Ensure updateLoadingLayer is run at least once 2021-08-17 17:18:23 +09:00
Dean Herbert
9eb16fa61d Move poll allowance logic based on signalr connection inside polling component 2021-08-17 17:16:21 +09:00
Dean Herbert
8a1651e830 Reorganise methods in PollingComponent 2021-08-17 17:04:32 +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
Dean Herbert
a901fca54a
Merge branch 'master' into multi-polling-request-refactor 2021-08-17 16:23:46 +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
smoogipoo
f2340c6dac Privatise mutable list 2021-08-17 09:48:33 +09:00
smoogipoo
5214731dc1 Refactor test a bit 2021-08-17 09:45:10 +09:00
smoogipoo
b672d4b936 Refactor RequestHandlingMultiplayerRoomManager to avoid confusion 2021-08-17 09:43:37 +09:00
smoogipoo
1e282432c9 Fix password in a better way 2021-08-17 09:40:25 +09:00
smoogipoo
c4a42c4db0 Fix BasicTestRoomManager overriding rooms 2021-08-17 09:36:59 +09:00
smoogipoo
352949069a Move filter to LoungeSubScreen 2021-08-17 09:36:43 +09:00
smoogipoo
97d5b80834 Fix joining with incorrect password 2021-08-17 09:18:21 +09:00
smoogipoo
6320768a67 Merge branch 'master' into multi-polling-request-refactor 2021-08-17 08:44:56 +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