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

36631 Commits

Author SHA1 Message Date
Dean Herbert
f2236312a0
Merge pull request #11259 from LittleEndu/scroll-to-20
Change vertical alignment of scroll target when clicking settings category buttons
2021-01-23 05:03:58 +09:00
Andrei Zavatski
e9d10bb6e7 Revert "Minor refactoring"
This reverts commit 3d42cc1f91.
2021-01-22 22:49:49 +03:00
Bartłomiej Dach
b692abd3c2 Simplify condition from two to one operand 2021-01-22 20:35:34 +01:00
Andrei Zavatski
3d42cc1f91 Minor refactoring 2021-01-22 22:27:26 +03:00
Bartłomiej Dach
360f26c13d Merge branch 'master' into scroll-to-20 2021-01-22 19:58:36 +01:00
Bartłomiej Dach
f3192877fe Update outdated comment 2021-01-22 19:48:33 +01:00
Andrei Zavatski
20161aea6a Show LoginOverlay if not logged-in when clicking on a pill 2021-01-22 21:47:53 +03:00
Bartłomiej Dach
61fcb486a8 Trim unnecessary parentheses 2021-01-22 19:47:38 +01:00
Andrei Zavatski
6379381f95 Make VotePill background transparent for own comments 2021-01-22 20:46:20 +03:00
Mysfit
e0f8f6a23f introduce overrideable bool instead of copying event logic entirely 2021-01-22 12:09:40 -05:00
Dan Balasescu
26779a9403
Merge pull request #11567 from peppy/fix-chat-local-echo-effect
Fix local echo messages remaining permanently dimmed when chatting via multiplayer
2021-01-22 21:58:55 +09:00
Dean Herbert
b44bd8c4ee Remove unused using statement 2021-01-22 18:03:33 +09:00
Dean Herbert
a9c8f9bd4a Fix a potential crash when exiting the editor before a new beatmap is added to the database 2021-01-22 17:47:38 +09:00
Dean Herbert
a5f7ca485b Fix unintended xmldoc tag edit 2021-01-22 16:53:31 +09:00
Dean Herbert
bfabb1fdea Change offset value to 10% 2021-01-22 16:50:22 +09:00
Dan Balasescu
6bb270cbdd
Merge pull request #11566 from peppy/limit-parallax-outside-container-area
Limit the effect of parallax when outside the bounds of the ParallaxContainer
2021-01-22 16:33:45 +09:00
Dean Herbert
fca6b15d2f Fix local echo messages remaining permanently dimmed when chatting via multiplayer 2021-01-22 16:05:45 +09:00
Dean Herbert
65b7075984 Limit the effect of parallax when outside the bounds of the ParallaxContainer
This fixes the visual issues that still remain when mouse confining
fails. I think it also feels more correct in general.
2021-01-22 15:43:19 +09:00
Dan Balasescu
a81f4a1ed3
Merge pull request #11560 from EVAST9919/profile-mapping-subscribers
Add mapping subscribers counter to ProfileOverlay
2021-01-22 14:42:11 +09:00
Dean Herbert
d24d236468 Make OperationCanceledException throwing behaviour consistent 2021-01-22 14:34:58 +09:00
Dean Herbert
9f89b4e6d7 Rewrite connection logic to better handle failure cases
The main goal here is to ensure the connection is built each connection
attempt. Previously, the access token would never be updated, leading to
outdated tokens failing repeatedly (in the connection retry loop) and
never being able to establish a new connection as a result.

Due to threading considerations, this isn't as simple as I would hope it
to be. I'm open to proposals as to a better way of handling this.

Also, keep in mind that this logic will need to be abstracted and
(re)used in `SpectatorClient` as well. I've intentionally not done that
yet until we agree that this is a good direction forward.
2021-01-22 14:25:23 +09:00
Mysfit
5b1bdfbdc5 Use callback method override 2021-01-21 20:06:24 -05:00
Mysfit
b53ad50cd4 Remove redundant variable 2021-01-21 18:00:37 -05:00
Mysfit
07ec0c0e0b Updated DrawableStoryboardSample to use GetBoundCopy() 2021-01-21 17:46:47 -05:00
Mysfit
b220939650 Fix storyboard samples continuing to play when the beatmap is paused or the intro is skipped. 2021-01-21 17:10:11 -05:00
Bartłomiej Dach
d0fd2ae432 Fix added zero-length slider test not working properly 2021-01-21 22:20:07 +01:00
Bartłomiej Dach
e4c5e5ba17 Separate return statement with blank line 2021-01-21 22:11:51 +01:00
Bartłomiej Dach
a71f769cce Add missing license header 2021-01-21 22:09:42 +01:00
Bartłomiej Dach
7046f64e7f Rewrite test scene 2021-01-21 22:09:17 +01:00
Andrei Zavatski
2eba2a9abf Rename FriendsButton to FollowersButton 2021-01-21 23:40:23 +03:00
Andrei Zavatski
c631354b57 Rename property 2021-01-21 23:39:19 +03:00
vmaggioli
a5f866d95c
Test updates 2021-01-21 15:14:24 -05:00
Andrei Zavatski
4555b9ff70 Make ProfileHeaderButton height defined 2021-01-21 22:56:12 +03:00
Andrei Zavatski
0a69268567 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-mapping-subscribers 2021-01-21 22:54:08 +03:00
Andrei Zavatski
e87197c7fc Adjust text size 2021-01-21 22:48:31 +03:00
Andrei Zavatski
343166f158 Make CreateIcon a property 2021-01-21 22:47:44 +03:00
Bartłomiej Dach
82848a7d70
Merge pull request #11556 from smoogipoo/fix-potential-mod-test-failures 2021-01-21 20:05:22 +01:00
Andrei Zavatski
a7c22ebe88 Implement MappingSubscribersButton component 2021-01-21 22:02:54 +03:00
Andrei Zavatski
966440f109 Add MappingFollowerCount field to User 2021-01-21 22:02:19 +03:00
Andrei Zavatski
2aa1df9ea4 Implement ProfileHeaderStatisticsButton component 2021-01-21 21:38:52 +03:00
Bartłomiej Dach
281fe6f6f9
Merge branch 'master' into fix-potential-mod-test-failures 2021-01-21 19:30:03 +01:00
Andrei Zavatski
05d3914fee Rename friends tooltip to followers 2021-01-21 21:26:33 +03:00
vmaggioli
e4b59c7317
Test setup 2021-01-21 11:54:26 -05:00
Dan Balasescu
1ae3f1b9eb
Merge pull request #11557 from peppy/leave-channel-on-exiting-multiplayer
Leave the multiplayer channel when leaving multiplayer
2021-01-21 19:35:12 +09:00
Dan Balasescu
0fa0e70bff
Merge branch 'master' into leave-channel-on-exiting-multiplayer 2021-01-21 19:04:33 +09:00
Dan Balasescu
658370ff38
Merge pull request #11499 from peppy/fix-editor-scroll-interruption
Fix inability to interrupt timeline flick-scrolls by other means
2021-01-21 18:39:11 +09:00
Dan Balasescu
04095cd5b9
Merge branch 'master' into fix-editor-scroll-interruption 2021-01-21 17:46:18 +09:00
Dan Balasescu
9eb74e86ed
Apply comment suggestion
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-01-21 17:40:15 +09:00
Dean Herbert
e6980688f6 Leave the multiplayer channel when leaving multiplayer 2021-01-21 15:42:23 +09:00
Dean Herbert
8853ac04d9 Rename some variable and add xmldoc for scroll centre position 2021-01-21 15:08:36 +09:00